Deprecate placeholder classes

ok, have put them back