Removing code that will never be hit and fixing playlists