deleted old mixin
Merge branch 'vic-branch'