Mixin class cleanup