python3 cleanups