Removed some no longer needed code from compat