Cleanup, especially removed probes and nameservices