Fix services handling.
Remove settings that would get duplicate.
Bump version.