Code cleanup for service and "service field prerequisites" validations