Clean-up of FileUpload.java