Remove old compat code that is no longer required