diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHConnectionImpl.java b/src/main/java/ru/yandex/metrika/clickhouse/CHConnectionImpl.java
index a4d95a0dd01baae1a50e511849d5699e51254fd3..76ceb4941e88f3c455c6150be7fe029695cc5605 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHConnectionImpl.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/CHConnectionImpl.java
@@ -308,27 +308,22 @@ public class CHConnectionImpl implements CHConnection {
         return false;
     }
 
-    @Override
     public void setSchema(String schema) throws SQLException {
 
     }
 
-    @Override
     public String getSchema() throws SQLException {
         return null;
     }
 
-    @Override
     public void abort(Executor executor) throws SQLException {
         this.close();
     }
 
-    @Override
     public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
 
     }
 
-    @Override
     public int getNetworkTimeout() throws SQLException {
         return 0;
     }
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHPreparedStatementImpl.java b/src/main/java/ru/yandex/metrika/clickhouse/CHPreparedStatementImpl.java
index 6898bdf13c0862e80a726bde314009758795a65b..6e6721a8b70ecf6b445104f263eb8f759abb8c27 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHPreparedStatementImpl.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/CHPreparedStatementImpl.java
@@ -11,8 +11,6 @@ import java.math.BigInteger;
 import java.net.URL;
 import java.sql.*;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
@@ -238,10 +236,6 @@ public class CHPreparedStatementImpl extends CHStatementImpl implements CHPrepar
                 setTime(parameterIndex, (Time) x);
             } else if (x instanceof Timestamp) {
                 setTimestamp(parameterIndex, (Timestamp) x);
-            } else if (x instanceof LocalDate) {
-                setDate(parameterIndex, Date.valueOf((LocalDate) x));
-            } else if (x instanceof LocalDateTime) {
-                setTimestamp(parameterIndex, Timestamp.valueOf((LocalDateTime) x));
             } else if (x instanceof Boolean) {
                 setBoolean(parameterIndex, ((Boolean) x).booleanValue());
             } else if (x instanceof InputStream) {
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java b/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java
index ecd49011217c49089233878d34823230bcfc7554..707e46d2b3f94025b7927be4db74b53ed0eb5202 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java
@@ -470,12 +470,10 @@ public class CHStatementImpl implements CHStatement {
         return params;
     }
 
-    @Override
     public void closeOnCompletion() throws SQLException {
         closeOnCompletion = true;
     }
 
-    @Override
     public boolean isCloseOnCompletion() throws SQLException {
         return closeOnCompletion;
     }
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHUtil.java b/src/main/java/ru/yandex/metrika/clickhouse/CHUtil.java
index 255aa4d24191b93bcddf83ba222ba28b220be57a..799cb28a1dc25c26828f44088cbc6c2eec3f1665 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHUtil.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/CHUtil.java
@@ -1,8 +1,5 @@
 package ru.yandex.metrika.clickhouse;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 
 /**
  * Created by zhur on 01/03/16.
@@ -68,16 +65,4 @@ public class CHUtil {
         return sb.toString();
     }
 
-    public static String quoteDate(LocalDate d) {
-        return "toDate(" + quote(d.format(DateTimeFormatter.ISO_LOCAL_DATE)) + ")";
-    }
-
-    public static String quoteDate(LocalDateTime d) {
-        return "toDate(" + quote(d.format(DateTimeFormatter.ISO_LOCAL_DATE)) + ")";
-    }
-
-    public static String quoteDateTime(LocalDateTime dt) {
-        return "toDateTime(" + quote(dt.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)) + ")";
-    }
-
 }