fix up and expand TrackrSanitiseClass