Optimize 'noservices' condition
6 files changed