clean up track.{h,cc}