Fixing scheduler issue when playing song is removed
Song removal is still broken