t17 - code cleanup