Replace placeholder classes

Deprecated placeholder classes and replaced with mixins throughout.
fair point - have added it