diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java b/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java
index 9755c7f7..e97cbc29 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java
@@ -50,8 +50,6 @@ public class AudioFileCoverFetcher implements DataFetcher<InputStream> {
     private InputStream fallback(String path) throws FileNotFoundException {
         File parent = new File(path).getParentFile();
         for (String fallback : FALLBACKS) {
-            // TODO make it smarter by enumerating folder contents and filtering for files
-            // example algorithm for that: http://askubuntu.com/questions/123612/how-do-i-set-album-artwork
             File cover = new File(parent, fallback);
             if (cover.exists()) {
                 return stream = new FileInputStream(cover);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
index 94772062..3bc551e9 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
@@ -22,8 +22,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.crashlytics.android.answers.Answers;
-import com.crashlytics.android.answers.CustomEvent;
 import com.kabouzeid.appthemehelper.ThemeStore;
 import com.kabouzeid.appthemehelper.util.ATHUtil;
 import com.kabouzeid.appthemehelper.util.NavigationViewUtil;
@@ -78,8 +76,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
         super.onCreate(savedInstanceState);
         ButterKnife.bind(this);
 
-        Answers.getInstance().logCustom(new CustomEvent("TEST")); // TODO remove in future update
-
         if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
             Util.setStatusBarTranslucent(getWindow());
             drawerLayout.setFitsSystemWindows(false);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
index 8b6ff85a..f751e30d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
@@ -36,7 +36,6 @@ public abstract class AbsThemeActivity extends ATHToolbarActivity {
         MaterialDialogsUtil.updateMaterialDialogsThemeSingleton(this);
     }
 
-    // TODO see "materialize" library for setting window flags
     protected void setDrawUnderStatusbar(boolean drawUnderStatusbar) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
             Util.setAllowDrawUnderStatusBar(getWindow());