Better way to delete current track