diff --git a/src/channel-storage/dbstore.js b/src/channel-storage/dbstore.js
index 163ff27d..c53d7a62 100644
--- a/src/channel-storage/dbstore.js
+++ b/src/channel-storage/dbstore.js
@@ -7,8 +7,6 @@ import Logger from '../logger';
 const SIZE_LIMIT = 1048576;
 const QUERY_CHANNEL_ID_FOR_NAME = 'SELECT id FROM channels WHERE name = ?';
 const QUERY_CHANNEL_DATA = 'SELECT `key`, `value` FROM channel_data WHERE channel_id = ?';
-const QUERY_UPDATE_CHANNEL_DATA =
-    'INSERT INTO channel_data VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE `value` = ?';
 
 function queryAsync(query, substitutions) {
     return new Promise((resolve, reject) => {
diff --git a/src/channel/channel.js b/src/channel/channel.js
index 7bfccc7c..e2e2940e 100644
--- a/src/channel/channel.js
+++ b/src/channel/channel.js
@@ -10,7 +10,7 @@ var sio = require("socket.io");
 var db = require("../database");
 import * as ChannelStore from '../channel-storage/channelstore';
 import { ChannelStateSizeError } from '../errors';
-import * as Promise from 'bluebird';
+import Promise from 'bluebird';
 
 /**
  * Previously, async channel functions were riddled with race conditions due to