Just a cleanup to enable support to update choreography and services