tidy up of HTTPTrackerClient