some pt2to3 cleanup