Python 3, remove some bundled code