Moving services from curate_nd to curate