diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
index 8c3da001f..dd8536023 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
@@ -13,7 +13,6 @@ import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.updater.AppUpdateJob
 import eu.kanade.tachiyomi.extension.ExtensionUpdateJob
 import eu.kanade.tachiyomi.network.PREF_DOH_CLOUDFLARE
-import eu.kanade.tachiyomi.ui.library.LibrarySort
 import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting
 import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
@@ -106,10 +105,9 @@ object Migrations {
                 // Reset sorting preference if using removed sort by source
                 val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0)
 
-                @Suppress("DEPRECATION")
-                if (oldSortingMode == LibrarySort.SOURCE) {
+                if (oldSortingMode == 5 /* SOURCE */) {
                     prefs.edit {
-                        putInt(PreferenceKeys.librarySortingMode, LibrarySort.ALPHA)
+                        putInt(PreferenceKeys.librarySortingMode, 0 /* ALPHABETICAL */)
                     }
                 }
             }
@@ -202,16 +200,15 @@ object Migrations {
                 val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0)
                 val oldSortingDirection = prefs.getBoolean(PreferenceKeys.librarySortingDirection, true)
 
-                @Suppress("DEPRECATION")
                 val newSortingMode = when (oldSortingMode) {
-                    LibrarySort.ALPHA -> SortModeSetting.ALPHABETICAL
-                    LibrarySort.LAST_READ -> SortModeSetting.LAST_READ
-                    LibrarySort.LAST_CHECKED -> SortModeSetting.LAST_CHECKED
-                    LibrarySort.UNREAD -> SortModeSetting.UNREAD
-                    LibrarySort.TOTAL -> SortModeSetting.TOTAL_CHAPTERS
-                    LibrarySort.LATEST_CHAPTER -> SortModeSetting.LATEST_CHAPTER
-                    LibrarySort.CHAPTER_FETCH_DATE -> SortModeSetting.DATE_FETCHED
-                    LibrarySort.DATE_ADDED -> SortModeSetting.DATE_ADDED
+                    0 -> SortModeSetting.ALPHABETICAL
+                    1 -> SortModeSetting.LAST_READ
+                    2 -> SortModeSetting.LAST_CHECKED
+                    3 -> SortModeSetting.UNREAD
+                    4 -> SortModeSetting.TOTAL_CHAPTERS
+                    6 -> SortModeSetting.LATEST_CHAPTER
+                    8 -> SortModeSetting.DATE_FETCHED
+                    7 -> SortModeSetting.DATE_ADDED
                     else -> SortModeSetting.ALPHABETICAL
                 }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
deleted file mode 100755
index 98792740f..000000000
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.ui.library
-
-@Deprecated("Deprecated in favor for SortModeSetting")
-object LibrarySort {
-
-    const val ALPHA = 0
-    const val LAST_READ = 1
-    const val LAST_CHECKED = 2
-    const val UNREAD = 3
-    const val TOTAL = 4
-    const val LATEST_CHAPTER = 6
-    const val CHAPTER_FETCH_DATE = 10
-    const val DATE_ADDED = 8
-
-    // SY -->
-    const val DRAG_AND_DROP = 7
-    const val TAG_LIST = 9
-
-    // SY <--
-
-    @Deprecated("Removed in favor of searching by source")
-    const val SOURCE = 5
-}
diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt
index 31ca60d70..50f6b367a 100644
--- a/app/src/main/java/exh/EXHMigrations.kt
+++ b/app/src/main/java/exh/EXHMigrations.kt
@@ -33,7 +33,6 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.all.Hitomi
 import eu.kanade.tachiyomi.source.online.all.NHentai
-import eu.kanade.tachiyomi.ui.library.LibrarySort
 import eu.kanade.tachiyomi.ui.library.setting.DisplayModeSetting
 import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting
 import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting
@@ -271,20 +270,20 @@ object EXHMigrations {
                 }
                 if (oldVersion under 20) {
                     try {
-                        val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0)
+                        val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0 /* ALPHABETICAL */)
                         val oldSortingDirection = prefs.getBoolean(PreferenceKeys.librarySortingDirection, true)
 
                         val newSortingMode = when (oldSortingMode) {
-                            LibrarySort.ALPHA -> SortModeSetting.ALPHABETICAL
-                            LibrarySort.LAST_READ -> SortModeSetting.LAST_READ
-                            LibrarySort.LAST_CHECKED -> SortModeSetting.LAST_MANGA_UPDATE
-                            LibrarySort.UNREAD -> SortModeSetting.UNREAD_COUNT
-                            LibrarySort.TOTAL -> SortModeSetting.TOTAL_CHAPTERS
-                            LibrarySort.LATEST_CHAPTER -> SortModeSetting.LATEST_CHAPTER
-                            LibrarySort.CHAPTER_FETCH_DATE -> SortModeSetting.CHAPTER_FETCH_DATE
-                            LibrarySort.DATE_ADDED -> SortModeSetting.DATE_ADDED
-                            LibrarySort.DRAG_AND_DROP -> SortModeSetting.DRAG_AND_DROP
-                            LibrarySort.TAG_LIST -> SortModeSetting.TAG_LIST
+                            0 -> SortModeSetting.ALPHABETICAL
+                            1 -> SortModeSetting.LAST_READ
+                            2 -> SortModeSetting.LAST_MANGA_UPDATE
+                            3 -> SortModeSetting.UNREAD_COUNT
+                            4 -> SortModeSetting.TOTAL_CHAPTERS
+                            6 -> SortModeSetting.LATEST_CHAPTER
+                            7 -> SortModeSetting.DRAG_AND_DROP
+                            8 -> SortModeSetting.DATE_ADDED
+                            9 -> SortModeSetting.TAG_LIST
+                            10 -> SortModeSetting.CHAPTER_FETCH_DATE
                             else -> SortModeSetting.ALPHABETICAL
                         }