Optimize noservice condition
2 files changed