diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index 1b231bf90..30922192c 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -150,18 +150,6 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
             }
         });
 
-        infoListAdapter.setOnHistoryItemSelectedListener(new OnClickGesture<HistoryInfoItem>() {
-            @Override
-            public void selected(HistoryInfoItem selectedItem) {
-                onStreamSelected(selectedItem);
-            }
-
-            @Override
-            public void held(HistoryInfoItem selectedItem) {
-                showHistoryItemDialog(selectedItem);
-            }
-        });
-
         infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<ChannelInfoItem>() {
             @Override
             public void selected(ChannelInfoItem selectedItem) {
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
index 0b600a25f..78867c81f 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
@@ -12,7 +12,6 @@ import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.local.history.HistoryInfoItem;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
@@ -51,7 +50,6 @@ public class InfoItemBuilder {
     private OnClickGesture<StreamInfoItem> onStreamSelectedListener;
     private OnClickGesture<ChannelInfoItem> onChannelSelectedListener;
     private OnClickGesture<PlaylistInfoItem> onPlaylistSelectedListener;
-    private OnClickGesture<HistoryInfoItem> onHistoryItemSelectedListener;
 
     public InfoItemBuilder(Context context) {
         this.context = context;
@@ -113,11 +111,4 @@ public class InfoItemBuilder {
         this.onPlaylistSelectedListener = listener;
     }
 
-    public OnClickGesture<HistoryInfoItem> getOnHistoryItemSelectedListener() {
-        return onHistoryItemSelectedListener;
-    }
-
-    public void setOnHistoryItemSelectedListener(OnClickGesture<HistoryInfoItem> onHistoryItemSelectedListener) {
-        this.onHistoryItemSelectedListener = onHistoryItemSelectedListener;
-    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index 1a2756646..9b3405484 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -10,7 +10,6 @@ import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.local.history.HistoryInfoItem;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
@@ -90,10 +89,6 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         infoItemBuilder.setOnPlaylistSelectedListener(listener);
     }
 
-    public void setOnHistoryItemSelectedListener(OnClickGesture<HistoryInfoItem> listener) {
-        infoItemBuilder.setOnHistoryItemSelectedListener(listener);
-    }
-
     public void useMiniItemVariants(boolean useMiniVariant) {
         this.useMiniVariant = useMiniVariant;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryInfoItem.java b/app/src/main/java/org/schabi/newpipe/local/history/HistoryInfoItem.java
deleted file mode 100644
index 5caba8aab..000000000
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryInfoItem.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.schabi.newpipe.local.history;
-
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.extractor.stream.StreamType;
-
-public class HistoryInfoItem extends StreamInfoItem {
-    public HistoryInfoItem(int serviceId, String url, String name, StreamType streamType) {
-        super(serviceId, url, name, streamType);
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
index f8642d69c..fae71b8ea 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
@@ -1,5 +1,23 @@
 package org.schabi.newpipe.local.history;
 
+/*
+ * Copyright (C) Mauricio Colli 2018
+ * HistoryRecordManager.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;