diff --git a/core/login_server_module.js b/core/login_server_module.js
index 4defd228..f75d3750 100644
--- a/core/login_server_module.js
+++ b/core/login_server_module.js
@@ -11,7 +11,6 @@ const UserProps = require('./user_property.js');
 //  deps
 const _ = require('lodash');
 const moment = require('moment');
-const Log = require('./logger.js');
 
 module.exports = class LoginServerModule extends ServerModule {
     constructor() {
diff --git a/core/theme.js b/core/theme.js
index 4fc9c331..ff1cc0a9 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -14,7 +14,6 @@ const UserProps = require('./user_property.js');
 
 const ConfigLoader = require('./config_loader');
 const { getConfigPath } = require('./config_util');
-const theme = require('./theme.js');
 
 //  deps
 const fs = require('graceful-fs');
@@ -420,9 +419,9 @@ function getRandomTheme() {
     }
 }
 function selectDefaultTheme(client) {
-    const selectedTheme = theme.findMatching(client, Config().theme.default);
+    const selectedTheme = findMatching(client, Config().theme.default);
     if (_.isNil(selectedTheme) || '*' === selectedTheme) {
-        return theme.getRandomTheme() || '';
+        return getRandomTheme() || '';
     } else {
         return selectedTheme;
     }