Datamanager - doc cleanup