fix some mixins; remove deprecated mixins