Remove mixin, move outside namespace (except has-error in reg)