Removed a bunch of code from _compat