Removed more references to the NLPService.