getting rid of track model class