diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/ArtistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/ArtistSongAdapter.java
index 16ea7cde..d6a5205a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/ArtistSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/ArtistSongAdapter.java
@@ -1,7 +1,5 @@
 package com.kabouzeid.gramophone.adapter.songadapter;
 
-import android.app.Activity;
-import android.content.Intent;
 import android.support.v4.util.Pair;
 import android.support.v7.app.ActionBarActivity;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/misc/AppKeys.java b/app/src/main/java/com/kabouzeid/gramophone/misc/AppKeys.java
index f58ce618..9c7be109 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/misc/AppKeys.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/misc/AppKeys.java
@@ -17,9 +17,9 @@ public final class AppKeys {
 
     public static final String E_ALBUM = "com.kabouzeid.gramophone.ALBUM";
     public static final String E_ARTIST = "com.kabouzeid.gramophone.ARTIST";
-//    public static final String E_SONG = "com.kabouzeid.gramophone.SONG";
+    //    public static final String E_SONG = "com.kabouzeid.gramophone.SONG";
     public static final String E_PLAYLIST = "com.kabouzeid.gramophone.PLAYLIST";
-//    public static final String E_TAG_EDIT_MODE = "com.kabouzeid.gramophone.TAG_EDIT_MODE";
+    //    public static final String E_TAG_EDIT_MODE = "com.kabouzeid.gramophone.TAG_EDIT_MODE";
     public static final String E_ID = "com.kabouzeid.gramophone.ID";
     public static final String E_PALETTE = "com.kabouzeid.gramophone.PALETTE";
 }
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 008d56ac..3961aac9 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
@@ -49,9 +49,6 @@ import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
 import com.kabouzeid.gramophone.ui.fragments.NavigationDrawerFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.AbsMainActivityFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.AlbumViewFragment;
-import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.ArtistViewFragment;
-import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.PlaylistViewFragment;
-import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.SongViewFragment;
 import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtils;
@@ -187,7 +184,6 @@ public class MainActivity extends AbsFabActivity
 
             @Override
             public void onPageScrollStateChanged(int state) {
-
             }
         });
     }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/Util.java b/app/src/main/java/com/kabouzeid/gramophone/util/Util.java
index 12285242..521b6219 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/Util.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/Util.java
@@ -9,7 +9,6 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.util.TypedValue;
 import android.view.View;
@@ -19,9 +18,6 @@ import android.view.inputmethod.InputMethodManager;
 
 import com.kabouzeid.gramophone.R;
 
-import java.util.Iterator;
-import java.util.Set;
-
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */