Removing uneeded mixins