Tracking code cleanup