Remove compat stuff