clean up `service.start()`
Merge branch 'proxy'