Merge "Remove sahara endpoint"