t827 - cleanup