clean up codebase after service-optional syntax changes