Mixin cleanup