PEP 454: cleanup