t603 - cleanup