diff --git a/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs b/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
index 8533ed666a..11156fc899 100644
--- a/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
+++ b/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load(AudioManager audioManager)
         {
-            Beatmap.Value = new WaveformTestBeatmap(audioManager.Track);
+            Beatmap.Value = new WaveformTestBeatmap();
 
             Children = new Drawable[]
             {
diff --git a/osu.Game.Tests/Visual/TestCaseWaveform.cs b/osu.Game.Tests/Visual/TestCaseWaveform.cs
index 8de7c2fda9..2616969b4c 100644
--- a/osu.Game.Tests/Visual/TestCaseWaveform.cs
+++ b/osu.Game.Tests/Visual/TestCaseWaveform.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load(AudioManager audioManager)
         {
-            Beatmap.Value = new WaveformTestBeatmap(audioManager.Track);
+            Beatmap.Value = new WaveformTestBeatmap();
 
             FillFlowContainer flow;
             Child = flow = new FillFlowContainer
diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index 1c1d1938bc..17aa7db14d 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -19,12 +19,10 @@ namespace osu.Game.Tests
     {
         private readonly ZipArchiveReader reader;
         private readonly FileStream stream;
-        private readonly TrackManager trackManager;
 
-        public WaveformTestBeatmap(TrackManager trackManager)
+        public WaveformTestBeatmap()
             : base(new BeatmapInfo())
         {
-            this.trackManager = trackManager;
             stream = File.OpenRead(ImportBeatmapTest.TEST_OSZ_PATH);
             reader = new ZipArchiveReader(stream);
         }
@@ -40,9 +38,9 @@ namespace osu.Game.Tests
 
         protected override Texture GetBackground() => null;
 
-        protected override Waveform GetWaveform() => trackManager.CreateWaveform(getAudioStream());
+        protected override Waveform GetWaveform() => new Waveform(getAudioStream());
 
-        protected override Track GetTrack() => trackManager.CreateTrack(getAudioStream());
+        protected override Track GetTrack() => new TrackBass(getAudioStream());
 
         private Stream getAudioStream() => reader.GetStream(reader.Filenames.First(f => f.EndsWith(".mp3")));
         private Stream getBeatmapStream() => reader.GetStream(reader.Filenames.First(f => f.EndsWith(".osu")));
diff --git a/osu.Game/Audio/PreviewTrackManager.cs b/osu.Game/Audio/PreviewTrackManager.cs
index 8e4e687a12..07fbe86ff4 100644
--- a/osu.Game/Audio/PreviewTrackManager.cs
+++ b/osu.Game/Audio/PreviewTrackManager.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Audio
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, FrameworkConfigManager config)
         {
-            trackManager = new TrackManager(new OnlineStore(), audio.Callback);
+            trackManager = new TrackManager(new OnlineStore());
 
             this.audio = audio;
             audio.AddItem(trackManager);
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 3ce5e86af2..e9a45dcaa2 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -21,7 +21,6 @@ namespace osu.Game.Beatmaps
         {
             private readonly IResourceStore<byte[]> store;
             private readonly AudioManager audioManager;
-            private readonly TrackManager trackManager;
 
             public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, TextureStore textureStore, BeatmapInfo beatmapInfo, AudioManager audioManager)
                 : base(beatmapInfo)
@@ -29,7 +28,6 @@ namespace osu.Game.Beatmaps
                 this.store = store;
                 this.textureStore = textureStore;
                 this.audioManager = audioManager;
-                trackManager = audioManager.Track;
             }
 
             protected override IBeatmap GetBeatmap()
@@ -71,7 +69,7 @@ namespace osu.Game.Beatmaps
                 try
                 {
                     var trackData = store.GetStream(getPathForFile(Metadata.AudioFile));
-                    return trackData == null ? null : trackManager.CreateTrack(trackData);
+                    return trackData == null ? null : new TrackBass(trackData);
                 }
                 catch
                 {
@@ -92,7 +90,7 @@ namespace osu.Game.Beatmaps
                 try
                 {
                     var trackData = store.GetStream(getPathForFile(Metadata.AudioFile));
-                    return trackData == null ? null : trackManager.CreateWaveform(trackData);
+                    return trackData == null ? null : new Waveform(trackData);
                 }
                 catch
                 {