Clean up the rest of the code depending on BrowseHistory and Playlist