Remove unused variable
Move upload to Uploader