SWORD: use non-deprecated ingestService method, other cleanup