LPS-46123 Deprecate old classes
LPS-46123 Regen
LPS-46123 Some more cases