Created removeTrack method instead of having code duplication