Removed testing stuff and duplicate mixins