t571 - code cleanup