DEV-91: clean up monitoring packages