diff --git a/proto/caosdb/entity/v1alpha1/main.proto b/proto/caosdb/entity/v1alpha1/main.proto
index ae5772db610f2d4d123bbde2e757a72290991cbf..c06a0a68a26835926072f86a8c182f01f485f93e 100644
--- a/proto/caosdb/entity/v1alpha1/main.proto
+++ b/proto/caosdb/entity/v1alpha1/main.proto
@@ -501,8 +501,8 @@ message RetrieveRequest {
   // Is the client requesting to download the file associated with the
   // retrieved entity or query results?
   bool register_file_download = 3;
-  // Settings for the download. Ignored if register_file_download is false.
-  FileTransmissionSettings download_settings = 4;
+  //TODO Settings for the download. Ignored if register_file_download is false.
+  //FileTransmissionSettings download_settings = 4;
 }
 
 // Response to a retrieve request
@@ -518,8 +518,6 @@ message RetrieveResponse {
     // Result of a COUNT query
     int64 count_result = 4;
   }
-  // Response to `register_file_download = true` in the RetrieveRequest.
-  string registration_id = 5;
 }
 
 // Single delete request (by id)
@@ -739,7 +737,7 @@ service FileTransmissionService {
   rpc RegisterFileUpload(RegisterFileUploadRequest)
       returns (RegisterFileUploadResponse);
   // The actual file upload. The upload has to be registered prior to this rpc.
-  rpc FileUpload(FileUploadRequest) returns (FileUploadResponse);
+  rpc FileUpload(stream FileUploadRequest) returns (FileUploadResponse);
   // A file download. The download has to be registered prior this rpc in the
   // RetrieveRequest.
   rpc FileDownload(FileDownloadRequest) returns (FileDownloadResponse);