Remove code for addressing services with '/' in the name