PRD-4379 - Metadata changes

also a bit of deprecated code cleanup in the legacy-parts of the engine.