Remove mixins; not yet ready