Replace placeholder classes

Deprecated placeholder classes and replaced with mixins throughout.
Yeah - this comment should've been removed, it doesn't mean anything...