Bug fix: remove track