Strategy Mixin cleanup