Remove redundant mixins