removing compat stuff