further T2 Radar cleanup