diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 69711c2b5..c1e627a90 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -37,18 +37,12 @@
             android:theme="@style/PreferencesTheme"
             android:parentActivityName=".MainActivity"
             android:label="@string/PS_settings_title">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".LoginActivity"
             android:label="@string/LoginActivityName"
             android:theme="@style/AppThemeWithActionBarBlackText"
             android:windowSoftInputMode="adjustResize" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".SkillTasksActivity"
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index ee762421c..ddc8e8fa0 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -66,9 +66,6 @@ dependencies {
     // Instant Layout Changing w/o recompile
     compile 'com.github.mmin18.layoutcast:library:1.+@aar'
 
-    // Instabug / In-App-Feedback
-    compile 'com.instabug.library:instabugsupport:+'
-
     // Changelog Fragment, minSDK 17
     compile 'com.github.porokoro.paperboy:paperboy:2.1.0'
 
diff --git a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
index 0f6af27f2..f7ec4674f 100644
--- a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
+++ b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
@@ -11,7 +11,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import com.facebook.FacebookSdk;
-import com.instabug.library.Instabug;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.raizlabs.android.dbflow.config.FlowManager;
 
@@ -48,9 +47,6 @@ public class HabiticaApplication extends Application {
         FlowManager.init(this);
 
         FacebookSdk.sdkInitialize(getApplicationContext());
-
-        Instabug.DEBUG = BuildConfig.DEBUG;
-        Instabug.initialize(this, "a5aa5f471a9cd8a958c0c55181172655");
     }
 
     // region SQLite overrides
diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
index fe882db17..022859258 100644
--- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
@@ -10,6 +10,7 @@ import android.support.design.widget.Snackbar;
 import android.support.design.widget.TabLayout;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
@@ -29,7 +30,6 @@ import com.habitrpg.android.habitica.ui.MainDrawerBuilder;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.habitrpg.android.habitica.userpicture.UserPicture;
 import com.habitrpg.android.habitica.userpicture.UserPictureRunnable;
-import com.instabug.wrapper.support.activity.InstabugAppCompatActivity;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Days;
@@ -66,7 +66,7 @@ import retrofit.Callback;
 import retrofit.RetrofitError;
 import retrofit.client.Response;
 
-public class MainActivity extends InstabugAppCompatActivity implements HabitRPGUserCallback.OnUserReceived {
+public class MainActivity extends AppCompatActivity implements HabitRPGUserCallback.OnUserReceived {
 
     public enum SnackbarDisplayType {
         NORMAL, FAILURE, DROP