Remove extra debugging code
Restructure output for Nagios mode from the UPS to match what Nagios expects