diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/AppearanceSettings.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/AppearanceSettings.kt
deleted file mode 100644
index 0419da8defce651b3680c11f365769b8636ee80c..0000000000000000000000000000000000000000
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/AppearanceSettings.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package de.kuschku.quasseldroid_ng.ui.settings.data
-
-import android.support.annotation.StyleRes
-import de.kuschku.quasseldroid_ng.R
-
-data class AppearanceSettings(
-  val showPrefix: ShowPrefixMode = ShowPrefixMode.HIGHEST,
-  val colorizeNicknames: ColorizeNicknamesMode = ColorizeNicknamesMode.ALL_BUT_MINE,
-  val inputEnter: InputEnterMode = InputEnterMode.EMOJI,
-  val colorizeMirc: Boolean = true,
-  val useMonospace: Boolean = false,
-  val showSeconds: Boolean = false,
-  val use24hClock: Boolean = true,
-  val showHostmask: Boolean = false,
-  val showLag: Boolean = true,
-  val theme: Theme = Theme.QUASSEL_LIGHT
-) {
-  enum class ColorizeNicknamesMode {
-    ALL,
-    ALL_BUT_MINE,
-    NONE;
-
-    companion object {
-      private val map = values().associateBy { it.name }
-      fun of(name: String) = map[name]
-    }
-  }
-
-  enum class InputEnterMode {
-    EMOJI,
-    SEND;
-
-    companion object {
-      private val map = values().associateBy { it.name }
-      fun of(name: String) = map[name]
-    }
-  }
-
-  enum class ShowPrefixMode {
-    ALL,
-    HIGHEST,
-    NONE;
-
-    companion object {
-      private val map = values().associateBy { it.name }
-      fun of(name: String) = map[name]
-    }
-  }
-
-  enum class Theme(@StyleRes val style: Int) {
-    QUASSEL_LIGHT(R.style.Theme_ChatTheme_Quassel_Light),
-    QUASSEL_DARK(R.style.Theme_ChatTheme_Quassel_Dark),
-    AMOLED(R.style.Theme_ChatTheme_Amoled),
-    SOLARIZED_LIGHT(R.style.Theme_ChatTheme_Solarized_Light),
-    SOLARIZED_DARK(R.style.Theme_ChatTheme_Solarized_Dark),
-    GRUVBOX_LIGHT(R.style.Theme_ChatTheme_Gruvbox_Light),
-    GRUVBOX_DARK(R.style.Theme_ChatTheme_Gruvbox_Dark);
-
-    companion object {
-      private val map = values().associateBy { it.name }
-      fun of(name: String) = map[name]
-    }
-  }
-
-  companion object {
-    val DEFAULT = AppearanceSettings()
-  }
-}
\ No newline at end of file
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/BacklogSettings.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/BacklogSettings.kt
deleted file mode 100644
index f432c9262a628fc0923a4d226b6c4d45dd61fd01..0000000000000000000000000000000000000000
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/BacklogSettings.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package de.kuschku.quasseldroid_ng.ui.settings.data
-
-data class BacklogSettings(
-  val dynamicAmount: Int = 20
-) {
-  companion object {
-    val DEFAULT = BacklogSettings()
-  }
-}
\ No newline at end of file
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/ConnectionSettings.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/ConnectionSettings.kt
deleted file mode 100644
index a328d9a6c76c91f4ed7b98f2517bc045fbd89780..0000000000000000000000000000000000000000
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/ConnectionSettings.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package de.kuschku.quasseldroid_ng.ui.settings.data
-
-data class ConnectionSettings(
-  val showNotification: Boolean = true
-) {
-  companion object {
-    val DEFAULT = ConnectionSettings()
-  }
-}
\ No newline at end of file
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/Settings.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/Settings.kt
deleted file mode 100644
index 2fe699a0785291500147543685758ff3defe9e69..0000000000000000000000000000000000000000
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/Settings.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-package de.kuschku.quasseldroid_ng.ui.settings.data
-
-import android.content.Context
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.ui.settings.data.AppearanceSettings.*
-import de.kuschku.quasseldroid_ng.util.helper.sharedPreferences
-
-object Settings {
-  fun appearance(context: Context) = context.sharedPreferences {
-    AppearanceSettings(
-      theme = Theme.of(
-        getString(
-          context.getString(R.string.preference_theme_key),
-          ""
-        )
-      ) ?: AppearanceSettings.DEFAULT.theme,
-      useMonospace = getBoolean(
-        context.getString(R.string.preference_monospace_key),
-        AppearanceSettings.DEFAULT.useMonospace
-      ),
-      showSeconds = getBoolean(
-        context.getString(R.string.preference_show_seconds_key),
-        AppearanceSettings.DEFAULT.showSeconds
-      ),
-      use24hClock = getBoolean(
-        context.getString(R.string.preference_use_24h_clock_key),
-        AppearanceSettings.DEFAULT.use24hClock
-      ),
-      showPrefix = ShowPrefixMode.of(
-        getString(
-          context.getString(R.string.preference_show_prefix_key),
-          ""
-        )
-      ) ?: AppearanceSettings.DEFAULT.showPrefix,
-      colorizeNicknames = ColorizeNicknamesMode.of(
-        getString(
-          context.getString(R.string.preference_colorize_nicknames_key),
-          ""
-        )
-      ) ?: AppearanceSettings.DEFAULT.colorizeNicknames,
-      inputEnter = InputEnterMode.of(
-        getString(
-          context.getString(R.string.preference_input_enter_key),
-          ""
-        )
-      ) ?: AppearanceSettings.DEFAULT.inputEnter,
-      colorizeMirc = getBoolean(
-        context.getString(R.string.preference_colorize_mirc_key),
-        AppearanceSettings.DEFAULT.colorizeMirc
-      ),
-      showHostmask = getBoolean(
-        context.getString(R.string.preference_hostmask_key),
-        AppearanceSettings.DEFAULT.showHostmask
-      ),
-      showLag = getBoolean(
-        context.getString(R.string.preference_show_lag_key),
-        AppearanceSettings.DEFAULT.showLag
-      )
-    )
-  }
-
-  fun backlog(context: Context) = context.sharedPreferences {
-    BacklogSettings(
-      dynamicAmount = getString(
-        context.getString(R.string.preference_dynamic_fetch_key),
-        BacklogSettings.DEFAULT.dynamicAmount.toString()
-      ).toIntOrNull() ?: BacklogSettings.DEFAULT.dynamicAmount
-    )
-  }
-
-  fun connection(context: Context) = context.sharedPreferences {
-    ConnectionSettings(
-      showNotification = getBoolean(
-        context.getString(R.string.preference_show_notification_key),
-        ConnectionSettings.DEFAULT.showNotification
-      )
-    )
-  }
-}
\ No newline at end of file