Minor improvements.
Properly allow removing the service configuration.
Fix missing unlock.

This is ugly, but I don't see an alternative except using a separate lock for the s.services field.
Remove TODO.
Close the service set connection on remove.