mixin section cleanup