diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityValidationInterceptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityValidationInterceptor.java
index 0fea59db33c97452138cfb5ce2d29c031297202a..61ea338acfd85dc6b2435081c5d2d78c122c25a2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityValidationInterceptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityValidationInterceptor.java
@@ -72,7 +72,6 @@ public class EntityValidationInterceptor extends EmptyInterceptor implements
      * marked for validation by validation scripts. We keep the track of validated entities in the
      * set, and keep the entities we still have to validate in entitiesToValidate.
      */
-    // TODO: refactor - there are too many collections here
     Set<IEntityInformationWithPropertiesHolder> modifiedEntities;
 
     Set<IEntityInformationWithPropertiesHolder> newEntities;