Removed unnecessary mixins