cleanup of code generated by 2to3