Update services to more closely model API in regard to delete functions. #36070