Remove service name and token