Clean up names service