Ticket #6407 - Settings services cleanup

Ticket #6407 - Settings services cleanup (items #2 and #3)