Remove dependency on serviceutils