diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeFunctions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeFunctions.scala
index 571dca88809eb..13ba2f2e5d62d 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeFunctions.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeFunctions.scala
@@ -34,15 +34,6 @@ case class CurrentDate() extends LeafExpression {
   override def eval(input: InternalRow): Any = {
     DateTimeUtils.millisToDays(System.currentTimeMillis())
   }
-
-  override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): String = {
-    val datetimeUtils = "org.apache.spark.sql.catalyst.util.DateTimeUtils"
-    s"""
-      boolean ${ev.isNull} = false;
-      ${ctx.javaType(dataType)} ${ev.primitive} =
-        $datetimeUtils.millisToDays(System.currentTimeMillis());
-    """
-  }
 }
 
 /**
@@ -58,11 +49,4 @@ case class CurrentTimestamp() extends LeafExpression {
   override def eval(input: InternalRow): Any = {
     System.currentTimeMillis() * 10000L
   }
-
-  override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): String = {
-    s"""
-      boolean ${ev.isNull} = false;
-      ${ctx.javaType(dataType)} ${ev.primitive} = System.currentTimeMillis() * 10000L;
-    """
-  }
 }
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DatetimeExpressionsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DatetimeExpressionsSuite.scala
index 2c019237ff504..44b915304533c 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/DatetimeExpressionsSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/DatetimeExpressionsSuite.scala
@@ -17,8 +17,6 @@
 
 package org.apache.spark.sql
 
-import java.sql.Date
-
 import org.apache.spark.sql.catalyst.util.DateTimeUtils
 import org.apache.spark.sql.functions._
 
@@ -27,7 +25,7 @@ class DatetimeExpressionsSuite extends QueryTest {
 
   import ctx.implicits._
 
-  val df1 = Seq((1, 2), (3, 1)).toDF("a", "b")
+  lazy val df1 = Seq((1, 2), (3, 1)).toDF("a", "b")
 
   test("function current_date") {
     val d0 = DateTimeUtils.millisToDays(System.currentTimeMillis())