diff --git a/packages/client-app/src/flux/nylas-api-helpers.es6 b/packages/client-app/src/flux/nylas-api-helpers.es6
index 170e45472..b5da43ca6 100644
--- a/packages/client-app/src/flux/nylas-api-helpers.es6
+++ b/packages/client-app/src/flux/nylas-api-helpers.es6
@@ -1,17 +1,11 @@
 /* eslint global-require: 0 */
-
 import _ from 'underscore'
-
 import NylasAPI from './nylas-api'
 import NylasAPIRequest from './nylas-api-request'
 import DatabaseStore from './stores/database-store'
-import Actions from './actions'
-import Account from './models/account'
 import Message from './models/message'
 import Thread from './models/thread'
 
-// Lazy-loaded
-let AccountStore = null
 
 function attachMetadataToResponse(jsons, metadataToAttach) {
   if (!metadataToAttach) return
diff --git a/packages/client-app/src/flux/syncback-task-api-request.es6 b/packages/client-app/src/flux/syncback-task-api-request.es6
index 79cf1a25d..999cc4b19 100644
--- a/packages/client-app/src/flux/syncback-task-api-request.es6
+++ b/packages/client-app/src/flux/syncback-task-api-request.es6
@@ -2,7 +2,7 @@ import Actions from './actions'
 import {APIError} from './errors'
 import DatabaseStore from './stores/database-store'
 import NylasAPIRequest from './nylas-api-request'
-import NylasAPIHelpers from './nylas-api-helpers'
+import * as NylasAPIHelpers from './nylas-api-helpers'
 import ProviderSyncbackRequest from './models/provider-syncback-request'
 
 /**