clean up mixins