Get rid of unused mixins/variables (cleanup)