Remove unnecessary mixin