CON-1548 | Mixins cleanup