diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
index f9388065f2729239344a5f11f982e67039d327c8..5b02f9128bfffed436d5cd2e29cbd60cbe51f4a2 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
@@ -111,7 +111,6 @@ public interface IEncapsulatedOpenBISService
     /**
      * Registers the specified sample.
      * 
-     * @param userIDOrNull TODO
      * @return the technical ID of the new sample
      */
     public long registerSample(final NewSample newSample, String userIDOrNull)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/GridExpressionUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/GridExpressionUtils.java
index 23388c5c3b5e786b0f82c659c08f753c7c608caa..aabe02c16598bf1f9fe87bada60ea38c906f2c91 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/GridExpressionUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/GridExpressionUtils.java
@@ -41,12 +41,12 @@ import ch.systemsx.cisd.openbis.generic.shared.util.DataTypeUtils;
 
 /**
  * Utility class containing functions helpful with dealing with grid custom filters or columns.
- * TODO: (CR) Instead of a bunch of static methods, this should be refactored using the Command
- * pattern to GridExpressionFilterCommand and GridExpressionColumnCommand. The arguments to the
- * functions should become ivars.
  * 
  * @author Izabela Adamczyk
  */
+// TODO 2010-02-16, CR: Instead of a bunch of static methods, this should be refactored using the
+// Command pattern to GridExpressionFilterCommand and GridExpressionColumnCommand. The arguments to
+// the functions should become ivars.
 public class GridExpressionUtils
 {
     private static final Logger operationLog =