Nagios updates and cleanup