Removed some mixins