clean up mixins. move vendors