Deprecate placeholder classes

I'll merge this and raise an issue