Disable PEP370 + some cleanup