DOCS-2674 cleanuporphaned