remove setCurentSong; remove commented out code