Track removal should be ok now