Clean up support for monitoring tool