Remove old tracking class