diff --git a/hoodie-cli/pom.xml b/hoodie-cli/pom.xml
index c20792e68..edc2773e9 100644
--- a/hoodie-cli/pom.xml
+++ b/hoodie-cli/pom.xml
@@ -193,6 +193,16 @@
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.9.6</version>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/hoodie-cli/src/main/java/com/uber/hoodie/cli/utils/HiveUtil.java b/hoodie-cli/src/main/java/com/uber/hoodie/cli/utils/HiveUtil.java
index 1b7267d4a..c348fbb2a 100644
--- a/hoodie-cli/src/main/java/com/uber/hoodie/cli/utils/HiveUtil.java
+++ b/hoodie-cli/src/main/java/com/uber/hoodie/cli/utils/HiveUtil.java
@@ -17,7 +17,6 @@
 package com.uber.hoodie.cli.utils;
 
 import com.uber.hoodie.common.model.HoodieTableMetadata;
-import com.uber.hoodie.hadoop.HoodieInputFormat;
 import org.apache.commons.dbcp.BasicDataSource;
 import org.joda.time.DateTime;
 
@@ -62,7 +61,6 @@ public class HiveUtil {
             //stmt.execute("set mapred.job.queue.name=<queue_name>");
             stmt.execute("set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat" );
             stmt.execute("set hive.stats.autogather=false" );
-            System.out.println("Class " + HoodieInputFormat.class.getName());
             rs = stmt.executeQuery(
                 "select count(`_hoodie_commit_time`) as cnt from " + dbName + "." + source
                     .getTableName());
diff --git a/hoodie-common/src/main/java/com/uber/hoodie/common/GenericHoodiePayload.java b/hoodie-common/src/main/java/com/uber/hoodie/common/GenericHoodiePayload.java
index 6144f99d4..263963ef7 100644
--- a/hoodie-common/src/main/java/com/uber/hoodie/common/GenericHoodiePayload.java
+++ b/hoodie-common/src/main/java/com/uber/hoodie/common/GenericHoodiePayload.java
@@ -21,15 +21,11 @@ import com.uber.hoodie.common.model.HoodieRecordPayload;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.IndexedRecord;
 import org.apache.commons.io.IOUtils;
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONObject;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.zip.Deflater;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.InflaterInputStream;
@@ -56,22 +52,6 @@ public class GenericHoodiePayload implements HoodieRecordPayload<GenericHoodiePa
         return jsonConverter.convert(getJsonData());
     }
 
-    public String getRowKey(HoodieSQLStreamer.Config cfg) throws IOException, JSONException {
-        JSONObject object = new JSONObject(getJsonData());
-        if(!object.has(cfg.keyColumnField)) {
-            return "";
-        }
-        return (String) object.get(cfg.keyColumnField);
-    }
-
-    public String getPartitionPath(HoodieSQLStreamer.Config cfg) throws IOException, JSONException {
-        JSONObject object = new JSONObject(getJsonData());
-        if(!object.has(cfg.partitionPathField)) {
-            return "0000/00/00";
-        }
-        return object.getString(cfg.partitionPathField);
-    }
-
     private String getJsonData() throws IOException {
         return unCompressData(jsonDataCompressed);
     }