Fixed Playlist issue; Cleanup