Removed unused mixins