diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.kt
index 751fadd06..4cafaa967 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.kt
@@ -20,7 +20,7 @@ import java.util.*
 
 object GSonFactoryCreator {
     fun create(): GsonConverterFactory {
-        val skillListType = object : TypeToken<List<Skill?>?>() {}.type
+        val skillListType = object : TypeToken<List<Skill>?>() {}.type
         val taskTagClassListType = object : TypeToken<RealmList<Tag?>?>() {}.type
         val customizationListType = object : TypeToken<RealmList<Customization?>?>() {}.type
         val tutorialStepListType = object : TypeToken<RealmList<TutorialStep?>?>() {}.type
@@ -34,7 +34,7 @@ object GSonFactoryCreator {
         val ownedItemListType = object : TypeToken<RealmList<OwnedItem?>?>() {}.type
         val ownedPetListType = object : TypeToken<RealmList<OwnedPet?>?>() {}.type
         val ownedMountListType = object : TypeToken<RealmList<OwnedMount?>?>() {}.type
-        val achievementsListType = object : TypeToken<List<Achievement?>?>() {}.type
+        val achievementsListType = object : TypeToken<List<Achievement>?>() {}.type
 
         val gson = GsonBuilder()
                 .registerTypeAdapter(taskTagClassListType, TaskTagDeserializer())
@@ -57,7 +57,6 @@ object GSonFactoryCreator {
                 .registerTypeAdapter(Challenge::class.java, ChallengeDeserializer())
                 .registerTypeAdapter(User::class.java, UserDeserializer())
                 .registerTypeAdapter(questCollectListType, QuestCollectDeserializer())
-                .registerTypeAdapter(chatMessageListType, ChatMessageListDeserializer())
                 .registerTypeAdapter(challengeListType, ChallengeListDeserializer())
                 .registerTypeAdapter(challengeRealmListType, ChallengeListDeserializer())
                 .registerTypeAdapter(questDropItemListType, QuestDropItemsListSerialization())
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt
index 54554c1b4..34cd25c92 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt
@@ -41,16 +41,6 @@ open class ChecklistItem : RealmObject, BaseMainObject, Parcelable {
         this.completed = item.completed
     }
 
-    override fun equals(other: Any?): Boolean {
-        return if (other?.javaClass == ChecklistItem::class.java && this.id != null) {
-            this.id == (other as? ChecklistItem)?.id
-        } else super.equals(other)
-    }
-
-    override fun hashCode(): Int {
-        return id?.hashCode() ?: 0
-    }
-
     override fun describeContents(): Int {
         return 0
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt
index fadc19124..bcbb8261c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt
@@ -18,16 +18,6 @@ open class RemindersItem : RealmObject, Parcelable {
     //Use to store task type before a task is created
     var type: String? = null
 
-    override fun equals(other: Any?): Boolean {
-        return if (other?.javaClass == RemindersItem::class.java) {
-            this.id == (other as? RemindersItem)?.id
-        } else super.equals(other)
-    }
-
-    override fun hashCode(): Int {
-        return id?.hashCode() ?: 0
-    }
-
     override fun describeContents(): Int {
         return 0
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
index 7fbb5455e..e4fbd27d9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
@@ -29,8 +29,6 @@ import javax.inject.Inject
 
 open class ShopFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
 
-
-
     internal val currencyView: CurrencyViews by lazy {
         val view = CurrencyViews(context)
         view
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageListDeserializer.kt
deleted file mode 100644
index 3628f9789..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageListDeserializer.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonParseException
-import com.habitrpg.android.habitica.models.social.ChatMessage
-
-import java.lang.reflect.Type
-
-import io.realm.RealmList
-
-class ChatMessageListDeserializer : JsonDeserializer<RealmList<ChatMessage>> {
-    @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): RealmList<ChatMessage> {
-        val messages = RealmList<ChatMessage>()
-
-        if (json.isJsonArray) {
-            json.asJsonArray.mapTo(messages) { context.deserialize(it, ChatMessage::class.java) }
-        } else {
-            for ((_, value) in json.asJsonObject.entrySet()) {
-                messages.add(context.deserialize(value, ChatMessage::class.java))
-            }
-        }
-        //Make sure the messageId is set for all likes
-        messages.forEach { it.id = it.id }
-
-        return messages
-    }
-}