A little refactoring, temporarily removed upload progress bar.