Remove all remaining references to custom compat.py