Improve docs and remove commented code in service definitions

Fixes #19