DOC-1022: clean-up