Fixes in track/vertex removal.