Remove ancient global methods from compat
Reorganize compat