Cleanup on Mixins