Removing hard dependency on NRPE