Further cleanup. Sampling Tracking -> Frame Tracking