diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index 25416d157..337ab0585 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -8,60 +8,59 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.models.responses.ErrorResponse;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.api.HostConfig;
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.database.CheckListItemExcludeStrategy;
-import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
-import com.habitrpg.android.habitica.models.inventory.Equipment;
-import com.habitrpg.android.habitica.models.inventory.QuestCollect;
-import com.habitrpg.android.habitica.models.user.User;
-import com.habitrpg.android.habitica.proxy.CrashlyticsProxy;
 import com.habitrpg.android.habitica.api.ApiService;
+import com.habitrpg.android.habitica.api.HostConfig;
 import com.habitrpg.android.habitica.api.Server;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
 import com.habitrpg.android.habitica.models.AchievementResult;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.habitrpg.android.habitica.models.ContentResult;
-import com.habitrpg.android.habitica.models.inventory.Customization;
 import com.habitrpg.android.habitica.models.FAQArticle;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.LeaveChallengeBody;
-import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
 import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
 import com.habitrpg.android.habitica.models.PurchaseValidationResult;
-import com.habitrpg.android.habitica.models.user.Purchases;
-import com.habitrpg.android.habitica.models.inventory.Quest;
-import com.habitrpg.android.habitica.models.shops.Shop;
 import com.habitrpg.android.habitica.models.Skill;
-import com.habitrpg.android.habitica.models.responses.Status;
 import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
 import com.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
 import com.habitrpg.android.habitica.models.TutorialStep;
 import com.habitrpg.android.habitica.models.auth.UserAuth;
 import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
 import com.habitrpg.android.habitica.models.auth.UserAuthSocial;
 import com.habitrpg.android.habitica.models.auth.UserAuthSocialTokens;
+import com.habitrpg.android.habitica.models.inventory.Customization;
 import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Food;
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.Quest;
+import com.habitrpg.android.habitica.models.inventory.QuestCollect;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
 import com.habitrpg.android.habitica.models.responses.BuyResponse;
+import com.habitrpg.android.habitica.models.responses.ErrorResponse;
 import com.habitrpg.android.habitica.models.responses.FeedResponse;
 import com.habitrpg.android.habitica.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
 import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.responses.Status;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
 import com.habitrpg.android.habitica.models.responses.UnlockResponse;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
 import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.user.Purchases;
+import com.habitrpg.android.habitica.models.user.User;
+import com.habitrpg.android.habitica.proxy.CrashlyticsProxy;
 import com.habitrpg.android.habitica.utils.BooleanAsIntAdapter;
 import com.habitrpg.android.habitica.utils.ChallengeDeserializer;
 import com.habitrpg.android.habitica.utils.ChallengeListDeserializer;
@@ -72,12 +71,12 @@ import com.habitrpg.android.habitica.utils.ContentDeserializer;
 import com.habitrpg.android.habitica.utils.CustomizationDeserializer;
 import com.habitrpg.android.habitica.utils.DateDeserializer;
 import com.habitrpg.android.habitica.utils.EggListDeserializer;
+import com.habitrpg.android.habitica.utils.EquipmentListDeserializer;
 import com.habitrpg.android.habitica.utils.FAQArticleListDeserilializer;
 import com.habitrpg.android.habitica.utils.FeedResponseDeserializer;
 import com.habitrpg.android.habitica.utils.FoodListDeserializer;
 import com.habitrpg.android.habitica.utils.GroupSerialization;
 import com.habitrpg.android.habitica.utils.HatchingPotionListDeserializer;
-import com.habitrpg.android.habitica.utils.EquipmentListDeserializer;
 import com.habitrpg.android.habitica.utils.MountListDeserializer;
 import com.habitrpg.android.habitica.utils.MountMapDeserializer;
 import com.habitrpg.android.habitica.utils.PetListDeserializer;
@@ -228,7 +227,6 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
 
         //Exclusion strategy needed for DBFlow https://github.com/Raizlabs/DBFlow/issues/121
         Gson gson = new GsonBuilder()
-                .setExclusionStrategies(new CheckListItemExcludeStrategy())
                 .registerTypeAdapter(taskTagClassListType, new TaskTagDeserializer())
                 .registerTypeAdapter(Boolean.class, new BooleanAsIntAdapter())
                 .registerTypeAdapter(boolean.class, new BooleanAsIntAdapter())
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/database/CheckListItemExcludeStrategy.java b/Habitica/src/main/java/com/habitrpg/android/habitica/database/CheckListItemExcludeStrategy.java
deleted file mode 100644
index 68a6e04cb..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/database/CheckListItemExcludeStrategy.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.habitrpg.android.habitica.database;
-
-import com.google.gson.ExclusionStrategy;
-import com.google.gson.FieldAttributes;
-
-/**
- * Created by franzejr on 29/11/15.
- */
-public class CheckListItemExcludeStrategy implements ExclusionStrategy {
-
-    @Override
-    public boolean shouldSkipField(FieldAttributes f) {
-        return f.getAnnotation(ExcludeCheckListItem.class) != null;
-    }
-
-    @Override
-    public boolean shouldSkipClass(Class<?> clazz) {
-        return clazz.getAnnotation(ExcludeCheckListItem.class) != null;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/database/ExcludeCheckListItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/database/ExcludeCheckListItem.java
deleted file mode 100644
index 30f8e29f4..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/database/ExcludeCheckListItem.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.habitrpg.android.habitica.database;
-
-/**
- * Created by franzejr on 29/11/15.
- */
-public @interface ExcludeCheckListItem {
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ContentReloadedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ContentReloadedEvent.java
deleted file mode 100644
index e56444faf..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ContentReloadedEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.habitrpg.android.habitica.events;
-
-public class ContentReloadedEvent {
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ReloadContentEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ReloadContentEvent.java
deleted file mode 100644
index 9e825656e..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ReloadContentEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.habitrpg.android.habitica.events;
-
-public class ReloadContentEvent {
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskDeleteEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskDeleteEvent.java
deleted file mode 100644
index 63ecd18a0..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskDeleteEvent.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-/**
- * Created by keithholliday on 7/18/16.
- */
-public class TaskDeleteEvent {
-    public Task task;
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java
deleted file mode 100644
index 5e4632c20..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-/**
- * Created by Negue on 10.07.2015.
- */
-public class TaskLongPressedEvent {
-    public Task task;
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskRemovedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskRemovedEvent.java
deleted file mode 100644
index 35da112f7..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskRemovedEvent.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.habitrpg.android.habitica.events;
-
-/**
- * Created by Negue on 01.12.2015.
- */
-public class TaskRemovedEvent {
-    public String deletedTaskId;
-
-    public TaskRemovedEvent(String id) {
-        deletedTaskId = id;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ToggledInnStateEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ToggledInnStateEvent.java
deleted file mode 100644
index ec4eeee7f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ToggledInnStateEvent.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.habitrpg.android.habitica.events;
-
-/**
- * Created by Negue on 24.08.2015.
- */
-public class ToggledInnStateEvent {
-    public boolean Inn;
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/UpdateGoldGemsPurchasedevent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/UpdateGoldGemsPurchasedevent.java
deleted file mode 100644
index 61e740f5f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/UpdateGoldGemsPurchasedevent.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.habitrpg.android.habitica.events;
-
-
-public class UpdateGoldGemsPurchasedevent {
-
-    public int numberLeft;
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/InvitePartyToQuestCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/InvitePartyToQuestCommand.java
deleted file mode 100644
index bdc586191..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/InvitePartyToQuestCommand.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-public class InvitePartyToQuestCommand {
-
-    public String questKey;
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java
deleted file mode 100644
index 71cf56b3f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-/**
- * Created by Negue on 24.08.2015.
- */
-public class SendNewGroupMessageCommand {
-    public String message;
-    public String targetGroupId;
-
-    public SendNewGroupMessageCommand(String targetGroupId, String message) {
-        this.targetGroupId = targetGroupId;
-        this.message = message;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ToggleInnCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ToggleInnCommand.java
deleted file mode 100644
index ea85f64ce..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ToggleInnCommand.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-/**
- * Created by Negue on 24.08.2015.
- */
-public class ToggleInnCommand {
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java
index 9c2a9a7f5..b0df8cb79 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java
@@ -12,12 +12,8 @@ import android.view.ViewGroup;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.commands.HatchingCommand;
-import com.habitrpg.android.habitica.events.commands.InvitePartyToQuestCommand;
-import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
 
-import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 public class ItemsFragment extends BaseMainFragment {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java
index 950b0942f..7cd2013ee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java
@@ -11,7 +11,7 @@ import android.widget.TextView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.events.UpdateGoldGemsPurchasedevent;
+import com.habitrpg.android.habitica.helpers.RxErrorHandler;
 import com.habitrpg.android.habitica.models.shops.Shop;
 import com.habitrpg.android.habitica.models.shops.ShopCategory;
 import com.habitrpg.android.habitica.models.shops.ShopItem;
@@ -21,8 +21,6 @@ import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
 import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
 
-import org.greenrobot.eventbus.Subscribe;
-
 import java.util.ArrayList;
 
 import javax.inject.Inject;
@@ -121,8 +119,7 @@ public class ShopFragment extends BaseFragment {
                 .subscribe(shop -> {
                     this.shop = shop;
                     this.adapter.setShop(shop);
-                }, throwable -> {
-                });
+                }, RxErrorHandler.handleEmptyError());
     }
 
     @Override
@@ -135,9 +132,4 @@ public class ShopFragment extends BaseFragment {
         super.onSaveInstanceState(outState);
         outState.putString(SHOP_IDENTIFIER_KEY, this.shopIdentifier);
     }
-
-    @Subscribe
-    public void updateGoldGemCount(UpdateGoldGemsPurchasedevent event) {
-        this.adapter.updateGoldGemCount(event.numberLeft);
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
index e99b83769..7b896fca8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
@@ -3,11 +3,9 @@ package com.habitrpg.android.habitica.ui.fragments.social;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
@@ -16,7 +14,6 @@ import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 
@@ -24,12 +21,9 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
 import com.habitrpg.android.habitica.events.commands.CopyChatMessageCommand;
 import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
 import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.SendNewGroupMessageCommand;
-import com.habitrpg.android.habitica.events.commands.ToggleInnCommand;
 import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
 import com.habitrpg.android.habitica.helpers.RxErrorHandler;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
@@ -39,7 +33,6 @@ import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 
-import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import javax.inject.Inject;
@@ -47,7 +40,6 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import butterknife.OnEditorAction;
 import butterknife.OnTextChanged;
 import io.realm.RealmResults;
 
@@ -223,26 +215,6 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
                 .subscribe(aVoid -> {}, throwable -> {});
     }
 
-    @Subscribe
-    public void onEvent(SendNewGroupMessageCommand cmd) {
-        socialRepository.postGroupChat(cmd.targetGroupId, cmd.message)
-                .subscribe(postChatMessageResult -> {}, throwable -> {});
-
-        UiUtils.dismissKeyboard(getActivity());
-    }
-
-    // If the ChatList is Tavern, we're able to toggle the sleep-mode
-    @Subscribe
-    public void onEvent(ToggleInnCommand event) {
-        userRepository.sleep(user)
-                .subscribe(habitRPGUser -> {
-                    ToggledInnStateEvent innState = new ToggledInnStateEvent();
-                    innState.Inn = habitRPGUser.getPreferences().getSleep();
-                    EventBus.getDefault().post(innState);
-                }, throwable -> {
-                });
-    }
-
     @Override
     public void onSaveInstanceState(Bundle outState) {
         outState.putString("userId", this.userId);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DaysUtils.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DaysUtils.java
deleted file mode 100644
index 9e4730c17..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DaysUtils.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.habitrpg.android.habitica.models.tasks.Days;
-
-/**
- * Created by magicmicky on 04/02/15.
- */
-
-
-public class DaysUtils {
-    public static Days getDaysFromBooleans(boolean[] b) {
-        Days d = new Days();
-        d.setM(b[0]);
-        d.setT(b[1]);
-        d.setW(b[2]);
-        d.setTh(b[3]);
-        d.setF(b[4]);
-        d.setS(b[5]);
-        d.setSu(b[6]);
-        return d;
-    }
-
-    public static boolean[] getBooleansFromDays(Days days) {
-        boolean[] b = new boolean[7];
-        b[0] = days.getM();
-        b[1] = days.getT();
-        b[2] = days.getW();
-        b[3] = days.getTh();
-        b[4] = days.getF();
-        b[5] = days.getS();
-        b[6] = days.getSu();
-        return b;
-    }
-}
-