diff --git a/build.gradle.kts b/build.gradle.kts
index c8e1f34..4f63b47 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -28,10 +28,6 @@ version = "1.0-SNAPSHOT"
 repositories {
     jcenter()
 
-    maven {
-        url = uri("https://maven.notfab.net/Hosted")
-    }
-
     maven {
         url = uri("https://jitpack.io")
     }
@@ -39,17 +35,12 @@ repositories {
 
 dependencies {
     api(group = "com.github.duncte123", name = "lavaplayer", version = "1dff250")
-    api(group = "net.notfab.cache", name = "cache-client", version = "2.2")
     api(group = "io.sentry", name = "sentry-logback", version = "1.7.17")
-    api(group = "com.google.apis", name = "google-api-services-youtube", version = "v3-rev212-1.25.0")
     api(group = "me.duncte123", name = "botCommons", version = "1.0.65")
-
-
-    implementation(group = "se.michaelthelin.spotify", name = "spotify-web-api-java", version = "4.2.1")
 }
 
 configure<JavaPluginConvention> {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
 }
 
 tasks.withType<Wrapper> {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
index 31fd7b4..0a27877 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
@@ -20,38 +20,23 @@
 import com.dunctebot.sourcemanagers.extra.YoutubeContextFilterOverride;
 import com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager;
 import com.dunctebot.sourcemanagers.speech.SpeechAudioSourceManager;
-import com.dunctebot.sourcemanagers.spotify.SpotifyAudioSourceManager;
-import com.dunctebot.sourcemanagers.youtube.YoutubeAudioSourceManagerOverride;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
-import net.notfab.caching.client.CacheClient;
+import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
 
 public class DuncteBotSources {
     public static void registerCustom(AudioPlayerManager playerManager, String speechLanguage,
-                                      int playlistPageCount, boolean updateYoutubeData,
-                                      String youtubeApiKey, CacheClient cacheClient,
-                                      String spotifyClientId, String spotifyClientSecret, int playlistLimit) {
+                                      int playlistPageCount, boolean updateYoutubeData) {
 
-        final YoutubeAudioSourceManagerOverride youtubeAudioSourceManager = new YoutubeAudioSourceManagerOverride(
-            cacheClient,
-            youtubeApiKey
-        );
+        final YoutubeAudioSourceManager youtubeSource = playerManager.source(YoutubeAudioSourceManager.class);
+        youtubeSource.setPlaylistPageCount(playlistPageCount);
+        youtubeSource.getMainHttpConfiguration()
+            .setHttpContextFilter(
+                new YoutubeContextFilterOverride(updateYoutubeData, youtubeSource.getHttpInterface())
+            );
 
-        youtubeAudioSourceManager.setPlaylistPageCount(playlistPageCount);
-        youtubeAudioSourceManager.getMainHttpConfiguration().setHttpContextFilter(new YoutubeContextFilterOverride(updateYoutubeData));
-
-        playerManager.registerSourceManager(
-            new SpotifyAudioSourceManager(
-                youtubeAudioSourceManager,
-                spotifyClientId,
-                spotifyClientSecret,
-                youtubeApiKey,
-                playlistLimit
-            )
-        );
         playerManager.registerSourceManager(new ClypitAudioSourceManager());
         playerManager.registerSourceManager(new SpeechAudioSourceManager(speechLanguage));
         playerManager.registerSourceManager(new PornHubAudioSourceManager());
-        playerManager.registerSourceManager(youtubeAudioSourceManager);
 
     }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/extra/LimitReachedException.java b/src/main/java/com/dunctebot/sourcemanagers/extra/LimitReachedException.java
deleted file mode 100644
index aa3dd9d..0000000
--- a/src/main/java/com/dunctebot/sourcemanagers/extra/LimitReachedException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2020 Duncan "duncte123" Sterken
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.dunctebot.sourcemanagers.extra;
-
-public class LimitReachedException extends RuntimeException {
-    private final int size;
-
-    public LimitReachedException(String message, int size) {
-        super(message);
-
-        this.size = size;
-    }
-
-    public int getSize() {
-        return size;
-    }
-}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
index e96ef04..ed5888e 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
@@ -17,20 +17,26 @@
 package com.dunctebot.sourcemanagers.extra;
 
 import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeHttpContextFilter;
+import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
+import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
+import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import io.sentry.Sentry;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.protocol.HttpClientContext;
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import static com.dunctebot.sourcemanagers.extra.YoutubeUtils.getYoutubeHeaderDetails;
-
 public class YoutubeContextFilterOverride extends YoutubeHttpContextFilter implements Closeable {
     private YoutubeVersionData youtubeVersionData = null;
+    private final HttpInterface httpInterface;
     private final ScheduledExecutorService dataUpdateThread = Executors.newSingleThreadScheduledExecutor((r) -> {
         final Thread t = new Thread();
         t.setName("YouTube-data-updater");
@@ -38,11 +44,13 @@ public class YoutubeContextFilterOverride extends YoutubeHttpContextFilter imple
         return t;
     });
 
-    public YoutubeContextFilterOverride() {
-        this(true);
+    public YoutubeContextFilterOverride(HttpInterface httpInterface) {
+        this(true, httpInterface);
     }
 
-    public YoutubeContextFilterOverride(boolean shouldUpdate) {
+    public YoutubeContextFilterOverride(boolean shouldUpdate, HttpInterface httpInterface) {
+        this.httpInterface = httpInterface;
+
         if (shouldUpdate) {
             dataUpdateThread.scheduleAtFixedRate(this::updateYoutubeData, 0L, 1L, TimeUnit.DAYS);
         }
@@ -56,6 +64,22 @@ private void updateYoutubeData() {
         }
     }
 
+    private YoutubeVersionData getYoutubeHeaderDetails() throws IOException {
+        final HttpGet httpGet = new HttpGet("https://www.youtube.com/");
+        httpGet.setHeader("User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36");
+
+        try (final CloseableHttpResponse response = this.httpInterface.execute(httpGet)) {
+            final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+
+            final String extracted = DataFormatTools.extractBetween(html,
+                "window.ytplayer = {};ytcfg.set(",
+                ");ytcfg.set(");
+            final JsonBrowser json = JsonBrowser.parse(extracted);
+
+            return YoutubeVersionData.fromBrowser(json);
+        }
+    }
+
     @Override
     public void onRequest(HttpClientContext context, HttpUriRequest request, boolean isRepetition) {
         super.onRequest(context, request, isRepetition);
@@ -71,7 +95,7 @@ public void onRequest(HttpClientContext context, HttpUriRequest request, boolean
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
         dataUpdateThread.shutdown();
     }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubePlaylistMetadata.java b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubePlaylistMetadata.java
deleted file mode 100644
index a965dee..0000000
--- a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubePlaylistMetadata.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2020 Duncan "duncte123" Sterken
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.dunctebot.sourcemanagers.extra;
-
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import jdk.internal.jline.internal.Nullable;
-
-import java.util.List;
-
-public class YoutubePlaylistMetadata {
-    private final String id;
-    private final String title;
-    private final String nextPageKey;
-    private final List<AudioTrackInfo> tracks;
-
-    public YoutubePlaylistMetadata(String id, String title, @Nullable String nextPageKey, List<AudioTrackInfo> tracks) {
-        this.id = id;
-        this.title = title;
-        this.nextPageKey = nextPageKey;
-        this.tracks = tracks;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    @Nullable
-    public String getNextPageKey() {
-        return nextPageKey;
-    }
-
-    public List<AudioTrackInfo> getTracks() {
-        return tracks;
-    }
-
-    @Override
-    public String toString() {
-        return "YoutubePlaylistMetadata{" +
-                "id='" + id + '\'' +
-                ", title='" + title + '\'' +
-                '}';
-    }
-}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeUtils.java b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeUtils.java
deleted file mode 100644
index 06164fb..0000000
--- a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeUtils.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright 2020 Duncan "duncte123" Sterken
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.dunctebot.sourcemanagers.extra;
-
-import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
-import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.services.youtube.YouTube;
-import com.google.api.services.youtube.model.*;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import me.duncte123.botcommons.web.WebUtils;
-import okhttp3.Request;
-
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class YoutubeUtils {
-
-    private static YouTube youtube;
-
-    static {
-        try {
-            youtube = new YouTube.Builder(
-                    GoogleNetHttpTransport.newTrustedTransport(), JacksonFactory.getDefaultInstance(), null)
-                    .setApplicationName("SkyBot-youtube-search")
-                    .build();
-        }
-        catch (GeneralSecurityException | IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static Video getVideoById(String videoID, String apiKey) throws IOException {
-        return getVideosByIdBase(videoID, apiKey)
-                .setMaxResults(1L)
-                .execute()
-                .getItems()
-                .get(0);
-    }
-
-    public static List<Video> getVideosByIds(String videoIds, String apiKey) throws IOException {
-        return getVideosByIdBase(videoIds, apiKey)
-                .execute()
-                .getItems();
-    }
-
-    public static List<SearchResult> searchYoutubeIdOnly(String query, String apiKey, long size) throws IOException {
-        return youtube.search().list("id")
-                .setKey(apiKey)
-                .setQ(query)
-                .setType("video")
-                .setMaxResults(size)
-                .execute()
-                .getItems();
-    }
-
-    public static List<SearchResult> searchYoutube(String query, String apiKey, long size) throws IOException {
-        return youtube.search().list("snippet")
-                .setKey(apiKey)
-                .setQ(query)
-                .setType("video")
-                .setFields("items(id/kind,id/videoId,snippet/title)")
-                .setMaxResults(size)
-                .execute()
-                .getItems();
-    }
-
-    @Nullable
-    public static YoutubePlaylistMetadata getPlaylistPageById(String playlistId, String apiKey, @Nullable String nextPageKey, boolean withExtraData) throws IOException {
-        String title = "";
-
-        if (withExtraData) {
-            title = getPlayListName(playlistId, apiKey);
-        }
-
-        if (title == null) {
-            return null;
-        }
-
-        final PlaylistItemListResponse playlistItems = youtube.playlistItems()
-                .list("snippet,contentDetails")
-                .setPageToken(nextPageKey)
-                .setPlaylistId(playlistId)
-                .setMaxResults(20L)
-//            .setMaxResults(1L)
-                .setKey(apiKey)
-                .execute();
-
-        final List<PlaylistItem> items = playlistItems.getItems();
-
-        if (items.isEmpty()) {
-            return new YoutubePlaylistMetadata(playlistId, title, null, new ArrayList<>());
-        }
-
-        final List<AudioTrackInfo> changedItems = items.stream()
-                .map((playlistItem) -> playListItemToTrackInfo(playlistItem, apiKey))
-                .collect(Collectors.toList());
-
-        return new YoutubePlaylistMetadata(playlistId, title, playlistItems.getNextPageToken(), changedItems);
-    }
-
-    public static String getThumbnail(Video video) {
-        return getThumbnail(video.getId());
-    }
-
-    public static String getThumbnail(String videoID) {
-        return "https://i.ytimg.com/vi/" + videoID + "/hq720.jpg";
-    }
-
-    public static AudioTrackInfo videoToTrackInfo(Video video) {
-        final VideoSnippet snippet = video.getSnippet();
-        final VideoContentDetails details = video.getContentDetails();
-
-        return new AudioTrackInfo(
-                snippet.getTitle(),
-                snippet.getChannelTitle(),
-                Duration.parse(details.getDuration()).toMillis(),
-                video.getId(),
-                false,
-                "https://www.youtube.com/watch?v=" + video.getId()
-        );
-    }
-
-    public static AudioTrackInfo playListItemToTrackInfo(PlaylistItem playlistItem, String apiKey) {
-        try {
-            final String videoId = playlistItem.getContentDetails().getVideoId();
-            final Video video = getVideoById(videoId, apiKey);
-
-            return videoToTrackInfo(video);
-        }
-        catch (IOException e) {
-            e.printStackTrace();
-            return null; // Should never happen tbh
-        }
-    }
-
-    public static YoutubeAudioTrack videoToTrack(Video video, YoutubeAudioSourceManager sourceManager) {
-        return new YoutubeAudioTrack(videoToTrackInfo(video), sourceManager);
-    }
-
-    public static YoutubeVersionData getYoutubeHeaderDetails() throws IOException {
-        final Request request = WebUtils.defaultRequest()
-                .url("https://www.youtube.com/")
-                .header("User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36")
-                .build();
-
-        final String html = WebUtils.ins.prepareRaw(request, (response) -> response.body().string()).execute();
-
-        final String extracted = DataFormatTools.extractBetween(html,
-                "window.ytplayer = {};ytcfg.set(",
-                ");ytcfg.set(");
-        final JsonBrowser json = JsonBrowser.parse(extracted);
-
-        return YoutubeVersionData.fromBrowser(json);
-    }
-
-    private static YouTube.Videos.List getVideosByIdBase(String videoIds, String apiKey) throws IOException {
-        return youtube.videos().list("id,snippet,contentDetails")
-                .setId(videoIds)
-                .setKey(apiKey)
-                .setFields("items(id/*,snippet/title,snippet/channelTitle,contentDetails/duration)");
-    }
-
-    /**
-     * Gets the name for a playlist
-     * <p>
-     * IMPORTANT: returns null if the playlist does not exist
-     */
-    @Nullable
-    private static String getPlayListName(String playlistId, String apiKey) throws IOException {
-        final List<Playlist> playlists = youtube.playlists()
-                .list("snippet")
-                .setId(playlistId)
-                .setKey(apiKey)
-                .execute()
-                .getItems();
-
-        if (playlists.isEmpty()) {
-            return null;
-        }
-
-        final Playlist playlist = playlists.get(0);
-
-        return playlist.getSnippet().getTitle();
-    }
-
-    /*private static YoutubeTrack searchCache(String title, String author, CacheClient cacheClient) {
-        final SearchParams params = new SearchParams()
-            .setSearch(title + " " + author)
-            .setTitle(title.split("\\s+"))
-            .setAuthor(author.split("\\s+"));
-
-        final List<YoutubeTrack> found = cacheClient.search(params);
-
-        if (found.isEmpty()) {
-            return null;
-        }
-
-        return found.get(0);
-    }
-
-    private static Video cacheToYoutubeVideo(YoutubeTrack track) {
-        return new Video()
-            .setId(track.getId())
-            .setKind("youtube#video")
-            .setSnippet(
-                new VideoSnippet()
-                    .setTitle(track.getTitle())
-                    .setChannelTitle(track.getAuthor())
-            )
-            .setContentDetails(
-                new VideoContentDetails()
-                    .setDuration(
-                        Duration.ofMillis(track.getLength()).toString()
-                    )
-            );
-    }*/
-}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
index 9b55807..add2287 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
@@ -16,6 +16,7 @@
 
 package com.dunctebot.sourcemanagers.pornhub;
 
+import com.dunctebot.sourcemanagers.AudioTrackInfoWithImage;
 import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
@@ -31,10 +32,6 @@
 import com.sedmelluq.discord.lavaplayer.track.AudioReference;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoBuilder;
-import fredboat.audio.player.LavalinkManager;
-import ml.duncte123.skybot.audio.sourcemanagers.AudioTrackInfoWithImage;
-import ml.duncte123.skybot.audio.sourcemanagers.IdentifiedAudioReference;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.CookieStore;
@@ -55,8 +52,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static ml.duncte123.skybot.audio.sourcemanagers.pornhub.PornHubAudioTrack.loadTrackUrl;
-
 public class PornHubAudioSourceManager implements AudioSourceManager, HttpConfigurable {
     private static final Pattern VIDEO_REGEX = Pattern.compile("^https?://(www\\.)?pornhub\\.(com|net)/view_video\\.php\\?viewkey=([a-zA-Z0-9]+)(?:.*)$");
     private static final Pattern VIDEO_INFO_REGEX = Pattern.compile("var flashvars_\\d+ = (\\{.+})");
@@ -148,16 +143,6 @@ private AudioItem loadItemOnce(AudioReference reference) throws IOException {
         final String uri = reference.identifier;
         final String imageUrl = videoInfo.get("image_url").safeText();
 
-        if (LavalinkManager.ins.isEnabled()) {
-            final AudioTrackInfo fakeInfo = AudioTrackInfoBuilder.empty().setIdentifier(uri).build();
-
-            return new IdentifiedAudioReference(
-                loadTrackUrl(fakeInfo, getHttpInterface()),
-                uri,
-                title
-            );
-        }
-
         return buildAudioTrack(
             title,
             author,
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index 3138e88..2e8b3d7 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -62,12 +62,12 @@ public void process(LocalAudioTrackExecutor executor) throws Exception {
         }
     }
 
-    /* package */ static String loadTrackUrl(AudioTrackInfo trackInfo, HttpInterface HttpInterface) throws IOException {
+    /* package */ static String loadTrackUrl(AudioTrackInfo trackInfo, HttpInterface httpInterface) throws IOException {
         final HttpGet httpGet = new HttpGet(trackInfo.identifier);
 
         httpGet.setHeader("Cookie", "platform=tv");
 
-        try (final CloseableHttpResponse response = HttpInterface.execute(httpGet)) {
+        try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
             final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
             final Matcher matcher = MEDIA_STRING.matcher(html);
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioSourceManager.java
index 6e29d4d..63d594f 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioSourceManager.java
@@ -16,21 +16,19 @@
 
 package com.dunctebot.sourcemanagers.speech;
 
+import com.dunctebot.sourcemanagers.IdentifiedAudioReference;
 import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.track.AudioItem;
 import com.sedmelluq.discord.lavaplayer.track.AudioReference;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import ml.duncte123.skybot.Author;
-import ml.duncte123.skybot.audio.sourcemanagers.IdentifiedAudioReference;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
-@Author(nickname = "ramidzkh", author = "Ramid Khan")
 public class SpeechAudioSourceManager extends HttpAudioSourceManager {
 
     private static final String PREFIX = "speak:";
diff --git a/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioTrack.java
index 0a81af9..3dbf33b 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioTrack.java
@@ -16,12 +16,10 @@
 
 package com.dunctebot.sourcemanagers.speech;
 
+import com.dunctebot.sourcemanagers.Mp3Track;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import ml.duncte123.skybot.Author;
-import ml.duncte123.skybot.audio.sourcemanagers.Mp3Track;
 
-@Author(nickname = "ramidzkh", author = "Ramid Khan")
 public class SpeechAudioTrack extends Mp3Track {
 
     SpeechAudioTrack(AudioTrackInfo trackInfo, SpeechAudioSourceManager manager) {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/spotify/SpotifyAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/spotify/SpotifyAudioSourceManager.java
deleted file mode 100644
index 062d9ea..0000000
--- a/src/main/java/com/dunctebot/sourcemanagers/spotify/SpotifyAudioSourceManager.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright 2020 Duncan "duncte123" Sterken
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.dunctebot.sourcemanagers.spotify;
-
-import com.dunctebot.sourcemanagers.AudioTrackInfoWithImage;
-import com.dunctebot.sourcemanagers.extra.LimitReachedException;
-import com.google.api.services.youtube.model.SearchResult;
-import com.google.api.services.youtube.model.Video;
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
-import com.sedmelluq.discord.lavaplayer.track.*;
-import com.wrapper.spotify.SpotifyApi;
-import com.wrapper.spotify.exceptions.SpotifyWebApiException;
-import com.wrapper.spotify.model_objects.credentials.ClientCredentials;
-import com.wrapper.spotify.model_objects.specification.*;
-import com.wrapper.spotify.requests.authorization.client_credentials.ClientCredentialsRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Nullable;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static com.dunctebot.sourcemanagers.extra.YoutubeUtils.*;
-
-public class SpotifyAudioSourceManager implements AudioSourceManager {
-
-    private static final Logger logger = LoggerFactory.getLogger(SpotifyAudioSourceManager.class);
-
-    private static final String PROTOCOL_REGEX = "?:spotify:(track:)|(?:http://|https://)[a-z]+\\.";
-    private static final String DOMAIN_REGEX = "spotify\\.com/";
-    private static final String TRACK_REGEX = "track/([a-zA-z0-9]+)";
-    private static final String ALBUM_REGEX = "album/([a-zA-z0-9]+)";
-    private static final String USER_PART = "user/(?:.*)/";
-    private static final String PLAYLIST_REGEX = "playlist/([a-zA-z0-9]+)";
-    private static final String REST_REGEX = "(?:.*)";
-    private static final String SPOTIFY_BASE_REGEX = PROTOCOL_REGEX + DOMAIN_REGEX;
-
-    private static final Pattern SPOTIFY_TRACK_REGEX = Pattern.compile("^(" + SPOTIFY_BASE_REGEX + TRACK_REGEX + ")" + REST_REGEX + "$");
-    private static final Pattern SPOTIFY_ALBUM_REGEX = Pattern.compile("^(" + SPOTIFY_BASE_REGEX + ALBUM_REGEX + ")" + REST_REGEX + "$");
-    private static final Pattern SPOTIFY_PLAYLIST_REGEX = Pattern.compile("^(" + SPOTIFY_BASE_REGEX + ")" + PLAYLIST_REGEX + REST_REGEX + "$");
-    private static final Pattern SPOTIFY_PLAYLIST_REGEX_USER = Pattern.compile("^(" + SPOTIFY_BASE_REGEX + ")" +
-        USER_PART + PLAYLIST_REGEX + REST_REGEX + "$");
-    private static final Pattern SPOTIFY_SECOND_PLAYLIST_REGEX = Pattern.compile("^(?:spotify:user:)(?:.*)(?::playlist:)(.*)$");
-    private final SpotifyApi spotifyApi;
-    private final YoutubeAudioSourceManager youtubeAudioSourceManager;
-    private final ScheduledExecutorService service;
-    /*private final String spotifyClientId;
-    private final String spotifyClientSecret;*/
-    private final String youtubeApiKey;
-    private final int playlistLimit;
-
-    public SpotifyAudioSourceManager(YoutubeAudioSourceManager youtubeAudioSourceManager,
-                                    String spotifyClientId, String spotifyClientSecret, String youtubeApiKey,
-                                     int playlistLimit) {
-        /*this.spotifyClientId = spotifyClientId;
-        this.spotifyClientSecret = spotifyClientSecret;*/
-        this.youtubeApiKey = youtubeApiKey;
-        this.playlistLimit = playlistLimit;
-
-        if (spotifyClientId == null || spotifyClientSecret == null || youtubeApiKey == null) {
-            logger.error("Could not load Spotify keys");
-            this.spotifyApi = null;
-            this.service = null;
-            this.youtubeAudioSourceManager = null;
-        } else {
-            this.youtubeAudioSourceManager = youtubeAudioSourceManager;
-            this.spotifyApi = new SpotifyApi.Builder()
-                .setClientId(spotifyClientId)
-                .setClientSecret(spotifyClientSecret)
-                .build();
-
-            this.service = Executors.newScheduledThreadPool(2, (r) -> new Thread(r, "Spotify-Token-Update-Thread"));
-            service.scheduleAtFixedRate(this::updateAccessToken, 0, 1, TimeUnit.HOURS);
-        }
-    }
-
-    @Override
-    public String getSourceName() {
-        return "spotify";
-    }
-
-    @Override
-    public AudioItem loadItem(DefaultAudioPlayerManager manager, AudioReference reference) {
-        return loadItem(reference, false);
-    }
-
-    public AudioItem loadItem(AudioReference reference, boolean isPatron) {
-
-        AudioItem item = getSpotifyAlbum(reference);
-
-        if (item == null) {
-            item = getSpotifyPlaylist(reference, isPatron);
-        }
-
-        if (item == null) {
-            item = getSpotifyTrack(reference);
-        }
-
-        return item;
-    }
-
-    private AudioItem getSpotifyAlbum(AudioReference reference) {
-        final Matcher res = SPOTIFY_ALBUM_REGEX.matcher(reference.identifier);
-
-        if (!res.matches()) {
-            return null;
-        }
-
-        try {
-            final List<String> videoIDs = new ArrayList<>();
-            final Future<Album> albumFuture = this.spotifyApi.getAlbum(res.group(res.groupCount())).build().executeAsync();
-            final Album album = albumFuture.get();
-
-            for (final TrackSimplified t : album.getTracks().getItems()) {
-                final String videoId = searchYoutube(t.getName(), album.getArtists()[0].getName());
-
-                if (videoId != null) {
-                    videoIDs.add(videoId);
-                }
-            }
-
-            final List<AudioTrack> playList = getTrackListFromVideoIds(videoIDs, album.getImages());
-
-            return new BasicAudioPlaylist(album.getName(), playList, playList.get(0), false);
-        }
-        catch (Exception e) {
-            //logger.error("Something went wrong!", e);
-            throw new FriendlyException(e.getMessage(), Severity.FAULT, e);
-        }
-    }
-
-    private AudioItem getSpotifyPlaylist(AudioReference reference, boolean isPatron) {
-
-        final Matcher res = getSpotifyPlaylistFromString(reference.identifier);
-
-        if (!res.matches()) {
-            return null;
-        }
-
-        final String playListId = res.group(res.groupCount());
-
-        try {
-            final List<String> videoIDs = new ArrayList<>();
-
-            final Playlist spotifyPlaylist = this.spotifyApi.getPlaylist(playListId).build().execute();
-            final PlaylistTrack[] playlistTracks = spotifyPlaylist.getTracks().getItems();
-
-            if (playlistTracks.length == 0) {
-                return null;
-            }
-
-            if (playlistTracks.length > this.playlistLimit && !isPatron) {
-                throw new LimitReachedException("The playlist is too big", this.playlistLimit);
-            }
-
-            for (final PlaylistTrack playlistTrack : playlistTracks) {
-                if (playlistTrack.getIsLocal()) {
-                    continue;
-                }
-
-                final Track track = playlistTrack.getTrack();
-                final String videoId = searchYoutube(track.getName(), track.getArtists()[0].getName());
-
-                if (videoId != null) {
-                    videoIDs.add(videoId);
-                }
-            }
-
-            final List<AudioTrack> finalPlaylist = getTrackListFromVideoIds(videoIDs, spotifyPlaylist.getImages());
-
-            return new BasicAudioPlaylist(spotifyPlaylist.getName(), finalPlaylist, finalPlaylist.get(0), false);
-        }
-        catch (IllegalArgumentException ex) {
-            throw new FriendlyException("This playlist could not be loaded, make sure that it's public", Severity.COMMON, ex);
-        }
-        catch (LimitReachedException e) {
-            throw e;
-        }
-        catch (Exception e) {
-            //logger.error("Something went wrong!", e);
-            throw new FriendlyException(e.getMessage(), Severity.FAULT, e);
-        }
-
-    }
-
-    private AudioItem getSpotifyTrack(AudioReference reference) {
-
-        final Matcher res = SPOTIFY_TRACK_REGEX.matcher(reference.identifier);
-
-        if (!res.matches()) {
-            return null;
-        }
-
-        try {
-            final Track track = this.spotifyApi.getTrack(res.group(res.groupCount())).build().execute();
-            final String videoId = searchYoutube(track.getName(), track.getArtists()[0].getName());
-
-            if (videoId == null) {
-                return null;
-            }
-
-            final Video v = getVideoById(videoId, this.youtubeApiKey);
-
-            return audioTrackFromVideo(v, track.getAlbum().getImages());
-        }
-        catch (Exception e) {
-            //logger.error("Something went wrong!", e);
-            throw new FriendlyException(e.getMessage(), Severity.FAULT, e);
-        }
-    }
-
-    @Override
-    public boolean isTrackEncodable(AudioTrack track) {
-        return true;
-    }
-
-    @Override
-    public void encodeTrack(AudioTrack track, DataOutput output) {
-        // Nothing to encode
-    }
-
-    @Override
-    public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
-        return new SpotifyAudioTrack(trackInfo, this.youtubeAudioSourceManager);
-    }
-
-    @Override
-    public void shutdown() {
-        if (this.service != null) {
-            this.service.shutdown();
-        }
-
-    }
-
-    private void updateAccessToken() {
-        try {
-            final ClientCredentialsRequest request = this.spotifyApi.clientCredentials().build();
-            final ClientCredentials clientCredentials = request.execute();
-
-            // Set access token for further "spotifyApi" object usage
-            this.spotifyApi.setAccessToken(clientCredentials.getAccessToken());
-
-            logger.debug("Successfully retrieved an access token! " + clientCredentials.getAccessToken());
-            logger.debug("The access token expires in " + clientCredentials.getExpiresIn() + " seconds");
-        }
-        catch (IOException | SpotifyWebApiException e) {
-            e.printStackTrace();
-            logger.error("Error while fetching Spotify token", e);
-
-            // Retry after 10 seconds
-            this.service.schedule(this::updateAccessToken, 10L, TimeUnit.SECONDS);
-        }
-    }
-
-    private Matcher getSpotifyPlaylistFromString(String input) {
-        final Matcher match = SPOTIFY_PLAYLIST_REGEX.matcher(input);
-
-        if (match.matches()) {
-            return match;
-        }
-
-        final Matcher withUser = SPOTIFY_PLAYLIST_REGEX_USER.matcher(input);
-
-        if (withUser.matches()) {
-            return withUser;
-        }
-
-        return SPOTIFY_SECOND_PLAYLIST_REGEX.matcher(input);
-    }
-
-    private List<AudioTrack> getTrackListFromVideoIds(List<String> videoIds, Image[] images) throws Exception {
-        final String videoIdsJoined = String.join(",", videoIds);
-        final List<Video> videosByIds = getVideosByIds(videoIdsJoined, this.youtubeApiKey);
-        final List<AudioTrack> playList = new ArrayList<>();
-
-        videosByIds.forEach((video) -> playList.add(audioTrackFromVideo(video, images)));
-
-        return playList;
-    }
-
-    @Nullable
-    private String searchYoutube(String title, String author) throws IOException {
-        final List<SearchResult> results = searchYoutubeIdOnly(title + " " + author, this.youtubeApiKey, 1L);
-
-        if (!results.isEmpty()) {
-            return results.get(0).getId().getVideoId();
-        }
-
-        return null;
-    }
-
-    private AudioTrack audioTrackFromVideo(Video v, Image[] images) {
-        return new SpotifyAudioTrack(new AudioTrackInfoWithImage(
-            v.getSnippet().getTitle(),
-            v.getSnippet().getChannelTitle(),
-            toLongDuration(v.getContentDetails().getDuration()),
-            v.getId(),
-            false,
-            "https://youtube.com/watch?v=" + v.getId(),
-            imageUrlOrThumbnail(images, v)
-        ), this.youtubeAudioSourceManager);
-    }
-
-    private String imageUrlOrThumbnail(Image[] images, Video video) {
-        if (images.length > 0) {
-            return images[0].getUrl();
-        }
-
-        return getThumbnail(video);
-    }
-
-    private long toLongDuration(String dur) {
-        return Duration.parse(dur).toMillis();
-    }
-}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/spotify/SpotifyAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/spotify/SpotifyAudioTrack.java
deleted file mode 100644
index 6914dbd..0000000
--- a/src/main/java/com/dunctebot/sourcemanagers/spotify/SpotifyAudioTrack.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2020 Duncan "duncte123" Sterken
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.dunctebot.sourcemanagers.spotify;
-
-
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import ml.duncte123.skybot.Author;
-
-@Author(nickname = "duncte123", author = "Duncan Sterken")
-public class SpotifyAudioTrack extends YoutubeAudioTrack {
-
-    SpotifyAudioTrack(AudioTrackInfo trackInfo, YoutubeAudioSourceManager sourceManager) {
-        super(trackInfo, sourceManager);
-    }
-}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/youtube/YoutubeApiPlaylistLoader.java b/src/main/java/com/dunctebot/sourcemanagers/youtube/YoutubeApiPlaylistLoader.java
deleted file mode 100644
index 4ac0775..0000000
--- a/src/main/java/com/dunctebot/sourcemanagers/youtube/YoutubeApiPlaylistLoader.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2020 Duncan "duncte123" Sterken
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.dunctebot.sourcemanagers.youtube;
-
-import com.dunctebot.sourcemanagers.extra.YoutubePlaylistMetadata;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubePlaylistLoader;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.BasicAudioPlaylist;
-import io.sentry.Sentry;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-
-import static com.dunctebot.sourcemanagers.extra.YoutubeUtils.getPlaylistPageById;
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.COMMON;
-
-public class YoutubeApiPlaylistLoader implements YoutubePlaylistLoader {
-    private final String apiKey;
-    private volatile int playlistPageCount = 6;
-
-    public YoutubeApiPlaylistLoader(String apiKey) {
-        this.apiKey = apiKey;
-    }
-
-    @Override
-    public void setPlaylistPageCount(int playlistPageCount) {
-        this.playlistPageCount = playlistPageCount;
-    }
-
-    @Override
-    public AudioPlaylist load(HttpInterface httpInterface, String playlistId, String selectedVideoId, Function<AudioTrackInfo, AudioTrack> trackFactory) {
-        try {
-            final YoutubePlaylistMetadata firstPage = getPlaylistPageById(playlistId, this.apiKey, null, true);
-
-            if (firstPage == null) {
-                throw new FriendlyException("This playlist does not exist", COMMON, null);
-            }
-
-            return buildPlaylist(firstPage, playlistId, selectedVideoId, trackFactory);
-        }
-        catch (IOException e) {
-            Sentry.capture(e);
-
-            throw ExceptionTools.wrapUnfriendlyExceptions(e);
-        }
-    }
-
-    private AudioPlaylist buildPlaylist(YoutubePlaylistMetadata firstPage, String playlistId, String selectedVideoId,
-                                        Function<AudioTrackInfo, AudioTrack> trackFactory) throws IOException {
-        final List<AudioTrack> convertedTracks = new ArrayList<>();
-
-        firstPage.getTracks()
-            .stream()
-            .map(trackFactory)
-            .forEach(convertedTracks::add);
-
-        String nextPageKey = firstPage.getNextPageKey();
-        int loadCount = 0;
-        final int pageCount = playlistPageCount;
-
-        while (nextPageKey != null && ++loadCount < pageCount) {
-            nextPageKey = fetchNextPage(nextPageKey, playlistId, trackFactory, convertedTracks);
-        }
-
-        return new BasicAudioPlaylist(
-            firstPage.getTitle(),
-            convertedTracks,
-            getSelectedTrack(selectedVideoId, convertedTracks),
-            false
-        );
-    }
-
-    private AudioTrack getSelectedTrack(String selectedVideoId, List<AudioTrack> tracks) {
-        if (selectedVideoId == null) {
-            return null;
-        }
-
-        for (final AudioTrack track : tracks) {
-            if (selectedVideoId.equals(track.getIdentifier())) {
-                return track;
-            }
-        }
-
-        return null;
-    }
-
-    private String fetchNextPage(String nextPageKey, String playlistId, Function<AudioTrackInfo, AudioTrack> trackFactory,
-                                                  List<AudioTrack> tracks) throws IOException {
-        final YoutubePlaylistMetadata nextPage = getPlaylistPageById(playlistId, this.apiKey, nextPageKey, false);
-
-        if (nextPage == null) {
-            return null;
-        }
-
-        nextPage.getTracks()
-            .stream()
-            .map(trackFactory)
-            .forEach(tracks::add);
-
-        return nextPage.getNextPageKey();
-    }
-}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/youtube/YoutubeApiSearchProvider.java b/src/main/java/com/dunctebot/sourcemanagers/youtube/YoutubeApiSearchProvider.java
deleted file mode 100644
index c8f5582..0000000
--- a/src/main/java/com/dunctebot/sourcemanagers/youtube/YoutubeApiSearchProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2020 Duncan "duncte123" Sterken
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.dunctebot.sourcemanagers.youtube;
-
-import com.google.api.services.youtube.model.SearchResult;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeSearchResultLoader;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.http.ExtendedHttpConfigurable;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import ml.duncte123.skybot.audio.sourcemanagers.youtube.YoutubeAudioSourceManagerOverride.DoNotCache;
-import net.notfab.caching.client.CacheClient;
-import net.notfab.caching.shared.SearchParams;
-import net.notfab.caching.shared.YoutubeTrack;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.function.Function;
-
-import static ml.duncte123.skybot.utils.YoutubeUtils.*;
-
-public class YoutubeApiSearchProvider implements YoutubeSearchResultLoader {
-    private final String apiKey;
-    private final CacheClient cacheClient;
-
-    public YoutubeApiSearchProvider(String apiKey, CacheClient cacheClient) {
-        this.apiKey = apiKey;
-        this.cacheClient = cacheClient;
-    }
-
-    @Override
-    public AudioItem loadSearchResult(String query, Function<AudioTrackInfo, AudioTrack> trackFactory) {
-        final AudioItem cacheItem = this.searchCache(query, trackFactory);
-
-        if (cacheItem == null) {
-            return this.searchYoutubeAPI(query, trackFactory);
-        }
-
-        return cacheItem;
-    }
-
-    @Override
-    public ExtendedHttpConfigurable getHttpConfiguration() {
-        return null;
-    }
-
-    private AudioItem searchYoutubeAPI(String query, Function<AudioTrackInfo, AudioTrack> trackFactory) {
-        try {
-            final List<SearchResult> searchResults = searchYoutube(query, this.apiKey, 1L);
-
-            if (searchResults.isEmpty()) {
-                return null;
-            }
-
-            final AudioTrackInfo info = videoToTrackInfo(
-                getVideoById(searchResults.get(0).getId().getVideoId(), this.apiKey)
-            );
-
-            return trackFactory.apply(info);
-        }
-        catch (IOException e) {
-            throw ExceptionTools.wrapUnfriendlyExceptions(e);
-        }
-    }
-
-    private AudioItem searchCache(String query, Function<AudioTrackInfo, AudioTrack> trackFactory) {
-        final SearchParams searchParams = new SearchParams().setSearch(query);
-        final List<YoutubeTrack> found = this.cacheClient.search(searchParams);
-
-        if (found.isEmpty()) {
-            return null;
-        }
-
-        final AudioTrackInfo info = found.get(0).toAudioTrack(null).getInfo();
-        final AudioTrack audioTrack = trackFactory.apply(info);
-
-        return new DoNotCache(audioTrack);
-    }
-}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/youtube/YoutubeAudioSourceManagerOverride.java b/src/main/java/com/dunctebot/sourcemanagers/youtube/YoutubeAudioSourceManagerOverride.java
deleted file mode 100644
index 100cd31..0000000
--- a/src/main/java/com/dunctebot/sourcemanagers/youtube/YoutubeAudioSourceManagerOverride.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2020 Duncan "duncte123" Sterken
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.dunctebot.sourcemanagers.youtube;
-
-import com.sedmelluq.discord.lavaplayer.source.youtube.*;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import net.notfab.caching.client.CacheClient;
-import net.notfab.caching.shared.CacheResponse;
-
-import java.io.IOException;
-
-import static com.dunctebot.sourcemanagers.extra.YoutubeUtils.getVideoById;
-import static com.dunctebot.sourcemanagers.extra.YoutubeUtils.videoToTrack;
-
-public class YoutubeAudioSourceManagerOverride extends YoutubeAudioSourceManager {
-
-    private final CacheClient cacheClient;
-    private final String ytApiKey;
-
-    public YoutubeAudioSourceManagerOverride(CacheClient cacheClient, String ytApiKey) {
-        super(
-            true,
-            new DefaultYoutubeTrackDetailsLoader(),
-            new YoutubeApiSearchProvider(ytApiKey, cacheClient),
-            new YoutubeSignatureCipherManager(),
-            new YoutubeApiPlaylistLoader(ytApiKey),
-            new DefaultYoutubeLinkRouter()
-        );
-
-        this.cacheClient = cacheClient;
-        this.ytApiKey = ytApiKey;
-    }
-
-    @Override
-    public AudioItem loadTrackWithVideoId(String videoId, boolean mustExist) {
-        final CacheResponse cacheResponse = this.cacheClient.get(videoId);
-
-        if (!cacheResponse.failure && cacheResponse.getTrack() != null) {
-            final AudioTrack track = cacheResponse.getTrack().toAudioTrack(this);
-            return new DoNotCache(track);
-        }
-
-        if (mustExist) {
-            return getFromYoutubeApi(videoId);
-        }
-
-        return super.loadTrackWithVideoId(videoId, mustExist);
-    }
-
-    private AudioItem getFromYoutubeApi(String videoId) {
-        try {
-            return videoToTrack(
-                getVideoById(videoId, this.ytApiKey),
-                this
-            );
-        } catch (IOException e) {
-            throw new FriendlyException("This video does not exist", FriendlyException.Severity.SUSPICIOUS, e);
-        }
-    }
-
-    /**
-     * Don't cache tracks that are already retrieved from the cache
-     */
-    public static class DoNotCache extends YoutubeAudioTrack {
-        DoNotCache(AudioTrack track) {
-            super(track.getInfo(), (YoutubeAudioSourceManager) track.getSourceManager());
-        }
-    }
-}