removed remaining Shell references in main API calls