Add some missing temp file deletes to upload. Make a note that we need to finish this.