Tidying up the uploader.