diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapterDeprecated.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapterDeprecated.java
deleted file mode 100644
index bb2427f0..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapterDeprecated.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.kabouzeid.gramophone.adapter;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.afollestad.materialdialogs.util.DialogUtils;
-import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
-import com.kabouzeid.gramophone.helper.menu.SongMenuHelper;
-import com.kabouzeid.gramophone.model.Song;
-import com.kabouzeid.gramophone.util.Util;
-
-import java.util.ArrayList;
-
-/**
- * @author Karim Abou Zeid (kabouzeid)
- */
-public class PlayingQueueAdapterDeprecated extends ArrayAdapter<Song> {
-
-    @NonNull
-    private final AppCompatActivity activity;
-
-    public PlayingQueueAdapterDeprecated(@NonNull AppCompatActivity activity, @NonNull ArrayList<Song> playList) {
-        super(activity, R.layout.item_list_single_row, playList);
-        this.activity = activity;
-    }
-
-    @Nullable
-    @Override
-    public View getView(final int position, @Nullable View convertView, ViewGroup parent) {
-        final Song song = getItem(position);
-        if (convertView == null) {
-            convertView = LayoutInflater.from(activity).inflate(R.layout.item_list_single_row, parent, false);
-        }
-        final TextView title = (TextView) convertView.findViewById(R.id.title);
-        final ImageView playingIndicator = (ImageView) convertView.findViewById(R.id.image);
-        final ImageView overflowButton = (ImageView) convertView.findViewById(R.id.menu);
-
-        title.setText(song.title);
-        if (MusicPlayerRemote.getPosition() == position) {
-            int iconPadding = activity.getResources().getDimensionPixelSize(R.dimen.list_item_image_icon_padding);
-            playingIndicator.setPadding(iconPadding, iconPadding, iconPadding, iconPadding);
-            playingIndicator.setImageDrawable(Util.getTintedDrawable(getContext(), R.drawable.ic_volume_up_white_24dp, DialogUtils.resolveColor(getContext(), android.R.attr.textColorSecondary)));
-            playingIndicator.setVisibility(View.VISIBLE);
-        } else {
-            playingIndicator.setVisibility(View.GONE);
-        }
-
-        convertView.findViewById(R.id.short_separator).setVisibility(View.GONE);
-
-        overflowButton.setOnClickListener(new SongMenuHelper.OnClickSongMenu(activity) {
-            @Override
-            public Song getSong() {
-                return song;
-            }
-
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                if (item.getItemId() == R.id.action_remove_from_playing_queue) {
-                    MusicPlayerRemote.removeFromQueue(position);
-                    notifyDataSetChanged();
-                    return true;
-                }
-                return super.onMenuItemClick(item);
-            }
-
-            @Override
-            public int getMenuRes() {
-                return R.menu.menu_item_playing_queue_song;
-            }
-        });
-        return convertView;
-    }
-}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java
deleted file mode 100644
index 2dd5c897..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/PlayingQueueDialog.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.kabouzeid.gramophone.dialogs;
-
-import android.app.Dialog;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.widget.AdapterView;
-
-import com.afollestad.materialdialogs.DialogAction;
-import com.afollestad.materialdialogs.MaterialDialog;
-import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.adapter.PlayingQueueAdapterDeprecated;
-import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
-import com.kabouzeid.gramophone.model.Song;
-import com.mobeta.android.dslv.DragSortListView;
-
-import java.util.ArrayList;
-
-/**
- * @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad)
- */
-public class PlayingQueueDialog extends LeakDetectDialogFragment {
-
-    public static PlayingQueueDialog create() {
-        final ArrayList<Song> playingQueue = MusicPlayerRemote.getPlayingQueue();
-        PlayingQueueDialog dialog = new PlayingQueueDialog();
-        Bundle args = new Bundle();
-        args.putParcelableArrayList("queue", playingQueue);
-        dialog.setArguments(args);
-        return dialog;
-    }
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        MaterialDialog dialog = new MaterialDialog.Builder(getActivity())
-                .title(getActivity().getResources().getString(R.string.label_current_playing_queue))
-                .customView(R.layout.dialog_playlist, false)
-                .positiveText(R.string.save_as_playlist)
-                .onPositive(new MaterialDialog.SingleButtonCallback() {
-                    @Override
-                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
-                        if (getActivity() == null)
-                            return;
-                        //noinspection unchecked
-                        ArrayList<Song> playingQueue = getArguments().getParcelableArrayList("queue");
-                        AddToPlaylistDialog.create(playingQueue).show(getActivity().getSupportFragmentManager(), "ADD_PLAYLIST");
-                    }
-                })
-                .build();
-
-        //noinspection unchecked
-        final ArrayList<Song> playingQueue = getArguments().getParcelableArrayList("queue");
-        final DragSortListView dragSortListView = (DragSortListView) dialog.getCustomView().findViewById(R.id.dragSortListView);
-        final PlayingQueueAdapterDeprecated playingQueueAdapterDeprecated =
-                new PlayingQueueAdapterDeprecated((AppCompatActivity) getActivity(), playingQueue);
-        dragSortListView.setAdapter(playingQueueAdapterDeprecated);
-        dragSortListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                MusicPlayerRemote.playSongAt(position);
-                playingQueueAdapterDeprecated.notifyDataSetChanged();
-            }
-        });
-        dragSortListView.setDropListener(new DragSortListView.DropListener() {
-            @Override
-            public void drop(int from, int to) {
-                MusicPlayerRemote.moveSong(from, to);
-                playingQueueAdapterDeprecated.notifyDataSetChanged();
-            }
-        });
-        dragSortListView.post(new Runnable() {
-            @Override
-            public void run() {
-                dragSortListView.requestFocus();
-                dragSortListView.setSelection(MusicPlayerRemote.getPosition());
-            }
-        });
-        return dialog;
-    }
-}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/menu/GenericMenuHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/menu/GenericMenuHelper.java
deleted file mode 100644
index b9959d9b..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/menu/GenericMenuHelper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.kabouzeid.gramophone.helper.menu;
-
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.view.MenuItem;
-
-/**
- * @author Karim Abou Zeid (kabouzeid)
- */
-public class GenericMenuHelper {
-    public static boolean handleMenuClick(@NonNull AppCompatActivity activity, @NonNull MenuItem item) {
-        return false;
-    }
-}