More trackster cleanup.