Cut out temp compat stuff