Interface simplfied by removing the -upload option.