Removed a couple general mixins