doc and monitoring cleanup