added mixins & removed unwanted packages