HHCOC-74: Clean up of assets