diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandler.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandler.java
index ec4c5fe33eb85916dd5777b93e37ace3c3c625ed..9838b386d4b392e06a25af153c129963889efbb4 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandler.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandler.java
@@ -108,10 +108,6 @@ class PutDataSetTopLevelDataSetHandler
         this.inputStream = inputStream;
         this.temporaryIncomingDir = service.createTemporaryIncomingDir(newDataSet.tryDataSetType());
         String dataSetFolderName = newDataSet.getDataSetFolderName();
-        // TODO, 2011-04-27, FJE: It would be better to allow null value for
-        // newDataSet.getDataSetFolderName()
-        // in order to distinguish a file data set from a folder data set. But this is a change
-        // in API which is small but non-backward compatible.
         boolean dataSetIsASingleFile =
                 NewDataSetDTO.DEFAULT_DATA_SET_FOLDER_NAME.equals(dataSetFolderName)
                         && newDataSet.getFileInfos().size() == 1;