Remove ambiguous code
Fix no retry on failed upload