Getting rid of canonical/requested name leftovers
Removing canonical/requested service name leftovers in the lib