diff --git a/client/src/modules/content.js b/client/src/modules/content.js
index cddd81de..cba21ed6 100644
--- a/client/src/modules/content.js
+++ b/client/src/modules/content.js
@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Utils, FileUtils, AsyncEventEmitter } from 'common';
+import { Utils, FileUtils, ClientLogger as Logger, AsyncEventEmitter } from 'common';
 import { Modals } from 'ui';
 
 export default class Content {
diff --git a/client/src/structs/settings/settingscategory.js b/client/src/structs/settings/settingscategory.js
index bf7c113b..aa0d9fa5 100644
--- a/client/src/structs/settings/settingscategory.js
+++ b/client/src/structs/settings/settingscategory.js
@@ -136,17 +136,17 @@ export default class SettingsCategory {
         setting.off('settings-updated', setting[this._eventsKey + '_settingscategory_event_settings-updated']);
 
         let index;
-        while ((index = this.settings.findIndex(c => c === category)) > -1) {
+        while ((index = this.settings.findIndex(s => s === setting)) > -1) {
             this.settings.splice(index, 0);
         }
 
         const event = {
             set: this, set_id: this.id,
-            category, category_id: category.id,
+            category: this, category_id: this.id,
             from_index: index
         };
 
-        await category.emit('removed-from', event);
+        await setting.emit('removed-from', event);
         await this.emit('removed-category', event);
     }