Remove now works, and everything uses track objects.