diff --git a/utils/funcexp/func_math.cpp b/utils/funcexp/func_math.cpp
index ee422703b..8690999db 100644
--- a/utils/funcexp/func_math.cpp
+++ b/utils/funcexp/func_math.cpp
@@ -340,8 +340,6 @@ double Func_asin::getDoubleVal(Row& row,
     }
 }
 
-
-
 //
 //	atan
 //
@@ -411,7 +409,7 @@ double Func_atan::getDoubleVal(Row& row,
             // null value is indicated by isNull
             long double value = parm[0]->data()->getLongDoubleVal(row, isNull);
 
-            if (isNull || (value < -1.0 || value > 1.0))
+            if (isNull)
             {
                 isNull = true;
                 return doubleNullVal();
@@ -607,7 +605,7 @@ double Func_cos::getDoubleVal(Row& row,
             // null value is indicated by isNull
             long double value = parm[0]->data()->getLongDoubleVal(row, isNull);
 
-            if (isNull || (value < -1.0 || value > 1.0))
+            if (isNull)
             {
                 isNull = true;
                 return doubleNullVal();
@@ -1146,19 +1144,6 @@ double Func_log2::getDoubleVal(Row& row,
                 return doubleNullVal();
             }
 
-            if (parm.size() > 1 )
-            {
-                long double value2 = parm[1]->data()->getLongDoubleVal(row, isNull);
-
-                if (isNull || (value2 <= 0.0 || value == 1.0) )
-                {
-                    isNull = true;
-                    return doubleNullVal();
-                }
-
-                return log2(value2) / log(value);
-            }
-
             return log2(value);
         }
         break;
@@ -1430,7 +1415,7 @@ double Func_sin::getDoubleVal(Row& row,
             // null value is indicated by NaN
             long double value = parm[0]->data()->getLongDoubleVal(row, isNull);
 
-            if (isNull || value <= 0.0)
+            if (isNull)
             {
                 isNull = true;
                 return doubleNullVal();
@@ -1694,7 +1679,7 @@ double Func_tan::getDoubleVal(Row& row,
             // null value is indicated by NaN
             long double value = parm[0]->data()->getLongDoubleVal(row, isNull);
 
-            if (isNull || value <= 0.0)
+            if (isNull)
             {
                 isNull = true;
                 return doubleNullVal();