Deprecate placeholder classes

I'm unclear on what we should do? What to uncomment?