diff --git a/app/src/main/java/com/kabouzeid/gramophone/misc/LagTracker.java b/app/src/main/java/com/kabouzeid/gramophone/misc/LagTracker.java
deleted file mode 100644
index 12ab4f81..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/misc/LagTracker.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.kabouzeid.gramophone.misc;
-
-import android.util.Log;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Aidan Follestad (afollestad)
- */
-public class LagTracker {
-
-    private static LagTracker mSingleton;
-    private static Map<String, Long> mMap;
-    private boolean mEnabled = true;
-
-    private LagTracker() {
-        mMap = new HashMap<>();
-    }
-
-    public static LagTracker get() {
-        if (mSingleton == null)
-            mSingleton = new LagTracker();
-        return mSingleton;
-    }
-
-    public LagTracker enable() {
-        mEnabled = true;
-        return this;
-    }
-
-    public LagTracker disable() {
-        mEnabled = false;
-        return this;
-    }
-
-    public void start(String key) {
-        final long start = System.nanoTime();
-        if (!mEnabled) {
-            if (!mMap.isEmpty())
-                mMap.clear();
-            return;
-        }
-        mMap.put(key, start);
-    }
-
-    public void end(String key) {
-        final long end = System.nanoTime();
-        if (!mEnabled) {
-            if (!mMap.isEmpty())
-                mMap.clear();
-            return;
-        }
-        if (!mMap.containsKey(key))
-            throw new IllegalStateException("No start time found for " + key);
-        long start = mMap.get(key);
-        long diff = end - start;
-        print(key, diff);
-        mMap.remove(key);
-    }
-
-    private void print(String key, long diff) {
-        long ms = TimeUnit.NANOSECONDS.toMillis(diff);
-        long s = TimeUnit.NANOSECONDS.toSeconds(diff);
-        Log.d("LagTracker", "[" + key + " completed in]: " + diff + " ns (" + ms + "ms, " + s + "s)");
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kabouzeid/gramophone/misc/SimpleTransitionListener.java b/app/src/main/java/com/kabouzeid/gramophone/misc/SimpleTransitionListener.java
deleted file mode 100644
index fda8216c..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/misc/SimpleTransitionListener.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.kabouzeid.gramophone.misc;
-
-import android.annotation.TargetApi;
-import android.os.Build;
-import android.transition.Transition;
-
-/**
- * @author Karim Abou Zeid (kabouzeid)
- */
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
-public abstract class SimpleTransitionListener implements Transition.TransitionListener {
-    @Override
-    public void onTransitionStart(Transition transition) {
-    }
-
-    @Override
-    public void onTransitionEnd(Transition transition) {
-    }
-
-    @Override
-    public void onTransitionCancel(Transition transition) {
-    }
-
-    @Override
-    public void onTransitionPause(Transition transition) {
-    }
-
-    @Override
-    public void onTransitionResume(Transition transition) {
-    }
-}