code cleanup in services-config