Removed mixin classes