clean up nagios class try 2

Change-Id: I3c1f3586c5b2bee45ca2a1aef331955ccdfaa31c