clean up some 2to3 stuff