keep the service simple
Merge branch 'simplify-service'