Cleaning up unused mixins