service name cleanup