Kill them mixins. Fixes #3