cleanup for 2to3 migration, not sure it is complete