CDB-3718 More removals of TrackRecord