Removed unneeded mixins