Clean mixin from 2.3.2