DOCS-2502: clearing up several items