TrackCandidateProducer clean-up