APY-47: Refactor CDM to include content metadata and make it extensible
applied review comments

cleanup unused imports and variables