Fix issues in configuration after merge.

Fixes #62 by removing duplicate services definitions.