diff --git a/Habitica/res/layout/activity_about.xml b/Habitica/res/layout/activity_about.xml
index d7edadf30..8d1ca5e0b 100644
--- a/Habitica/res/layout/activity_about.xml
+++ b/Habitica/res/layout/activity_about.xml
@@ -1,6 +1,4 @@
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_about.xml b/Habitica/res/layout/fragment_about.xml
index 41d89aa8d..e44cc5731 100644
--- a/Habitica/res/layout/fragment_about.xml
+++ b/Habitica/res/layout/fragment_about.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<layout xmlns:bind="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_party_info.xml b/Habitica/res/layout/fragment_party_info.xml
index 54c151b9a..00cddc227 100644
--- a/Habitica/res/layout/fragment_party_info.xml
+++ b/Habitica/res/layout/fragment_party_info.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <layout xmlns:bind="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <data>
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index 6084ce68e..121001972 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bind="http://schemas.android.com/apk/res-auto">
 
     <data>
diff --git a/Habitica/res/layout/tavern_daniel_item.xml b/Habitica/res/layout/tavern_daniel_item.xml
index 5eb570d12..a97738fcb 100644
--- a/Habitica/res/layout/tavern_daniel_item.xml
+++ b/Habitica/res/layout/tavern_daniel_item.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="wrap_content">
 
     <ImageView
         android:layout_width="wrap_content"
diff --git a/Habitica/src/com/habitrpg/android/habitica/APIHelper.java b/Habitica/src/com/habitrpg/android/habitica/APIHelper.java
index 88287ce69..9c0e8fdda 100644
--- a/Habitica/src/com/habitrpg/android/habitica/APIHelper.java
+++ b/Habitica/src/com/habitrpg/android/habitica/APIHelper.java
@@ -3,7 +3,6 @@ package com.habitrpg.android.habitica;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.Debug;
 import android.support.v7.app.AlertDialog;
 import android.view.View;
 
diff --git a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
index 0b768012e..0a7fb7c94 100644
--- a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
+++ b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
@@ -22,6 +22,7 @@ import org.solovyev.android.checkout.Inventory;
 import org.solovyev.android.checkout.ProductTypes;
 import org.solovyev.android.checkout.Products;
 import org.solovyev.android.checkout.PurchaseVerifier;
+import org.solovyev.android.checkout.RequestListener;
 
 import java.io.File;
 import java.util.Arrays;
diff --git a/Habitica/src/com/habitrpg/android/habitica/HostConfig.java b/Habitica/src/com/habitrpg/android/habitica/HostConfig.java
index 3ed42523b..8a03462df 100644
--- a/Habitica/src/com/habitrpg/android/habitica/HostConfig.java
+++ b/Habitica/src/com/habitrpg/android/habitica/HostConfig.java
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica;
-import java.lang.String; /**
+
+/**
  * The configuration of the host<br />
  * Currently, the Port isn't used at all.
  * @author MagicMicky
diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
index f2f937a56..3017688dc 100644
--- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
@@ -1,11 +1,10 @@
 package com.habitrpg.android.habitica;
 
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.os.Debug;
 import android.preference.PreferenceManager;
-import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.design.widget.Snackbar;
 import android.support.design.widget.TabLayout;
 import android.support.v4.content.ContextCompat;
@@ -120,6 +119,14 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
                 .build();
 
         drawer.setSelectionAtPosition(1);
+        
+        // Create Checkout
+
+        checkout = Checkout.forActivity(this, HabiticaApplication.Instance.getCheckout());
+
+        checkout.start();
+
+        EventBus.getDefault().register(this);
     }
 
 
@@ -138,14 +145,6 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
         }catch (Exception e){
             Log.e("SHARED PREFERENCES", e.getMessage());
         }
-
-        // Create Checkout
-
-        checkout = Checkout.forActivity(this, HabiticaApplication.Instance.getCheckout());
-
-        checkout.start();
-
-        EventBus.getDefault().register(this);
     }
 
     public void onEvent(OpenGemPurchaseFragmentCommand cmd){
diff --git a/Habitica/src/com/habitrpg/android/habitica/SkillTasksActivity.java b/Habitica/src/com/habitrpg/android/habitica/SkillTasksActivity.java
index 6d1c8f966..3b620928b 100644
--- a/Habitica/src/com/habitrpg/android/habitica/SkillTasksActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/SkillTasksActivity.java
@@ -5,21 +5,12 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
 
-import com.habitrpg.android.habitica.ui.adapter.HabitItemRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.SkillTasksRecyclerViewFragment;
-import com.habitrpg.android.habitica.ui.fragments.TaskRecyclerViewFragment;
-import com.habitrpg.android.habitica.ui.fragments.TasksFragment;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 
diff --git a/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
index 8b4e2d213..3c1ae86e7 100644
--- a/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
+++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica.callbacks;
 
-import android.util.Log;
-
 import com.crashlytics.android.Crashlytics;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 
diff --git a/Habitica/src/com/habitrpg/android/habitica/callbacks/SkillCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/SkillCallback.java
index 24628f8e4..a981b8854 100644
--- a/Habitica/src/com/habitrpg/android/habitica/callbacks/SkillCallback.java
+++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/SkillCallback.java
@@ -1,13 +1,9 @@
 package com.habitrpg.android.habitica.callbacks;
 
-import android.util.Log;
-
 import com.crashlytics.android.Crashlytics;
 import com.habitrpg.android.habitica.events.SkillUsedEvent;
-import com.habitrpg.android.habitica.events.TaskCreatedEvent;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.Skill;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 
 import de.greenrobot.event.EventBus;
 import retrofit.Callback;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java b/Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java
index f9c7660c1..189e0fbdd 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java
@@ -6,15 +6,15 @@ import android.support.v7.widget.Toolbar;
 import android.view.View;
 
 import com.habitrpg.android.habitica.AboutActivity;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.habitrpg.android.habitica.MainActivity;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.prefs.PrefsActivity;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.habitrpg.android.habitica.ui.fragments.GemsPurchaseFragment;
 import com.habitrpg.android.habitica.ui.fragments.PartyFragment;
-import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.fragments.SkillsFragment;
 import com.habitrpg.android.habitica.ui.fragments.TasksFragment;
 import com.habitrpg.android.habitica.ui.fragments.TavernFragment;
-import com.habitrpg.android.habitica.prefs.PrefsActivity;
 import com.mikepenz.materialdrawer.AccountHeader;
 import com.mikepenz.materialdrawer.AccountHeaderBuilder;
 import com.mikepenz.materialdrawer.Drawer;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
index a1ee46f74..a3bc1a8b9 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.databinding.DataBindingUtil;
 import android.databinding.ObservableArrayList;
-import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -27,28 +26,25 @@ import com.habitrpg.android.habitica.databinding.DailyItemCardBinding;
 import com.habitrpg.android.habitica.databinding.HabitItemCardBinding;
 import com.habitrpg.android.habitica.databinding.RewardItemCardBinding;
 import com.habitrpg.android.habitica.databinding.TodoItemCardBinding;
-import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
 import com.habitrpg.android.habitica.events.HabitScoreEvent;
-import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
 import com.habitrpg.android.habitica.events.TaskCreatedEvent;
 import com.habitrpg.android.habitica.events.TaskLongPressedEvent;
 import com.habitrpg.android.habitica.events.TaskSaveEvent;
 import com.habitrpg.android.habitica.events.TaskTappedEvent;
 import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
+import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
 import com.habitrpg.android.habitica.events.commands.FilterTasksByTagsCommand;
+import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
 import com.habitrpg.android.habitica.helpers.TagsHelper;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.raizlabs.android.dbflow.runtime.FlowContentObserver;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.OrderBy;
 import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-import com.raizlabs.android.dbflow.structure.Model;
 
 import java.util.List;
 import java.util.UUID;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
index e1e32f770..b7b386505 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
@@ -1,12 +1,8 @@
 package com.habitrpg.android.habitica.ui.adapter;
 
-import android.app.Activity;
-import android.content.Context;
 import android.databinding.DataBindingUtil;
 import android.databinding.ObservableArrayList;
-import android.os.Handler;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,20 +12,15 @@ import android.widget.TextView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.SkillTasksActivity;
 import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding;
-import com.habitrpg.android.habitica.events.TaskLongPressedEvent;
-import com.habitrpg.android.habitica.events.TaskTappedEvent;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.OrderBy;
 import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-import com.raizlabs.android.dbflow.structure.Model;
 
 import java.util.UUID;
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
-import de.greenrobot.event.EventBus;
 
 
 public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter<SkillTasksRecyclerViewAdapter.ViewHolder> {
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
index 7e19997a2..81fc39704 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
@@ -1,49 +1,21 @@
 package com.habitrpg.android.habitica.ui.adapter;
 
-import android.content.Context;
 import android.content.res.Resources;
-import android.databinding.DataBindingUtil;
-import android.support.v7.widget.AppCompatEditText;
-import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.databinding.ValueBarBinding;
-import com.habitrpg.android.habitica.events.TaskTappedEvent;
-import com.habitrpg.android.habitica.events.commands.CopyChatAsTodoCommand;
-import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.OpenNewPMActivityCommand;
-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.events.commands.UseSkillCommand;
-import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.habitrpg.android.habitica.userpicture.UserPicture;
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.Skill;
-import com.mikepenz.fontawesome_typeface_library.FontAwesome;
-import com.mikepenz.iconics.Iconics;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Optional;
 import de.greenrobot.event.EventBus;
 
 /**
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/AccountDetailsFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/AccountDetailsFragment.java
index d4c870d67..df0f66bc5 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/AccountDetailsFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/AccountDetailsFragment.java
@@ -2,11 +2,8 @@ package com.habitrpg.android.habitica.ui.fragments;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.preference.Preference;
 import android.preference.PreferenceFragment;
-import android.preference.PreferenceScreen;
 
-import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 
 import java.util.Map;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
index e2bd5fa2e..9acb4b22c 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
@@ -2,26 +2,19 @@ package com.habitrpg.android.habitica.ui.fragments;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.widget.TextView;
 
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.MainActivity;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.mikepenz.materialdrawer.interfaces.OnCheckedChangeListener;
 
-import butterknife.ButterKnife;
 import de.greenrobot.event.EventBus;
 import de.greenrobot.event.EventBusException;
 
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
index 008f87e53..e99fe9a45 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.fragments;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillTasksRecyclerViewFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillTasksRecyclerViewFragment.java
index 5a79e2eae..8e925c32e 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillTasksRecyclerViewFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillTasksRecyclerViewFragment.java
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments;
 
-import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
@@ -13,7 +11,6 @@ import android.view.ViewGroup;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand;
-import com.habitrpg.android.habitica.ui.adapter.HabitItemRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
 
 import de.greenrobot.event.EventBus;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java
index dacd1bffe..5d6863aa2 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java
@@ -1,50 +1,29 @@
 package com.habitrpg.android.habitica.ui.fragments;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.SkillTasksActivity;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.callbacks.SkillCallback;
 import com.habitrpg.android.habitica.events.SkillUsedEvent;
-import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
-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.events.commands.UseSkillCommand;
-import com.habitrpg.android.habitica.ui.adapter.ChatRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter;
-import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.PostChatMessageResult;
 import com.magicmicky.habitrpgwrapper.lib.models.Skill;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
-import de.greenrobot.event.EventBus;
-import retrofit.Callback;
-import retrofit.RetrofitError;
-import retrofit.client.Response;
 
 /**
  * Created by viirus on 25/11/15.
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
index 6e3611801..d960a6ad7 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
@@ -6,10 +6,8 @@ import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.DrawerLayout;
 import android.util.Log;
diff --git a/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java
index 64db34f72..71693cf28 100644
--- a/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java
+++ b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java
@@ -7,7 +7,6 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
 import android.util.Log;
 import android.widget.ImageView;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/api/TypeAdapter/TagsAdapter.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/api/TypeAdapter/TagsAdapter.java
index a5f3a6c70..2787aac39 100644
--- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/api/TypeAdapter/TagsAdapter.java
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/api/TypeAdapter/TagsAdapter.java
@@ -8,7 +8,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java
index c352f068c..bca4aa70b 100644
--- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java
@@ -3,7 +3,6 @@ package com.magicmicky.habitrpgwrapper.lib.models;
 import com.habitrpg.android.habitica.R;
 
 import java.util.Date;
-import java.util.Dictionary;
 import java.util.HashMap;
 
 
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
index 8d0d2e0c9..6b94b387f 100644
--- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
@@ -1,11 +1,9 @@
 package com.magicmicky.habitrpgwrapper.lib.models;
 
 import com.google.gson.annotations.SerializedName;
-import com.habitrpg.android.habitica.HabitDatabase;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.Table;
 
 /**
  * Created by MagicMicky on 12/06/2014.
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/SkillList.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/SkillList.java
index c8579687d..cdf6b51dd 100644
--- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/SkillList.java
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/SkillList.java
@@ -1,7 +1,5 @@
 package com.magicmicky.habitrpgwrapper.lib.models;
 
-import java.util.HashMap;
-
 /**
  * Created by viirus on 25/11/15.
  */
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Tag.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Tag.java
index d28035691..26eedc4f5 100644
--- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Tag.java
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Tag.java
@@ -5,7 +5,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ModelContainer;
 import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.OneToMany;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
 import com.raizlabs.android.dbflow.annotation.Table;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java
index 2748451d1..0ee64f6fd 100644
--- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java
@@ -5,7 +5,6 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.magicmicky.habitrpgwrapper.lib.models.ContentResult;
 import com.magicmicky.habitrpgwrapper.lib.models.Skill;
 import com.magicmicky.habitrpgwrapper.lib.models.SkillList;
 import com.raizlabs.android.dbflow.runtime.TransactionManager;