diff --git a/index.js b/index.js
index e238414..f1ed024 100644
--- a/index.js
+++ b/index.js
@@ -181,12 +181,10 @@ class RBCassandra {
         return this.store.getTableSchema(domain, req.params.table)
         .then((res) => ({
             status: 200,
-            headers: { etag: res.tid.toString() },
             body: res.schema
         }))
         .catch((e) => ({
             status: 500,
-
             body: {
                 type: 'schema_query_error',
                 title: 'Internal error querying table schema in Cassandra storage backend',
diff --git a/lib/db.js b/lib/db.js
index 80b89e3..dcb62ae 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -2,7 +2,6 @@
 
 const P = require('bluebird');
 const cass = require('cassandra-driver');
-const TimeUuid = cass.types.TimeUuid;
 const extend = require('extend');
 const dbu = require('./dbutils');
 const cassID = dbu.cassID;
@@ -302,8 +301,6 @@ class DB {
         if (!req.schema) {
             throw new Error('Table not found!');
         }
-        const schema = req.schema;
-        const query = req.query;
         const queryOptions = { consistency: req.consistency, prepare: true };
         const queryInfo = dbu.buildPutQuery(req);
 
diff --git a/lib/dbutils.js b/lib/dbutils.js
index 6412298..e4110d8 100644
--- a/lib/dbutils.js
+++ b/lib/dbutils.js
@@ -331,11 +331,6 @@ dbu.makeSchemaInfo = function makeSchemaInfo(schema, isMetaCF) {
     // Then add some private properties
     psi.versioned = false;
 
-    // Check if the last index entry is a timeuuid, which we take to mean that
-    // this table is versioned
-    const lastElem = schema.index[schema.index.length - 1];
-    const lastKey = lastElem.attribute;
-
     // Extract attributes that need conversion in the read or write path
     psi.conversions = {};
     Object.keys(psi.attributes).forEach((att) => {