add clean up and service name