Remove old prepatcher based mixins