Remove more NRPE logic