diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/AbstractDataSetInfoExtractor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/AbstractDataSetInfoExtractor.java
index 1461d0cc154b8f3ca56443a74b1c756717cc9d3a..9e192297c4abed590e3f26a5aedf0be836077277 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/AbstractDataSetInfoExtractor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/AbstractDataSetInfoExtractor.java
@@ -24,11 +24,6 @@ import java.util.Properties;
 import ch.rinn.restrictions.Private;
 import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.common.parser.AbstractParserObjectFactory;
-import ch.systemsx.cisd.common.parser.IParserObjectFactory;
-import ch.systemsx.cisd.common.parser.IParserObjectFactoryFactory;
-import ch.systemsx.cisd.common.parser.IPropertyMapper;
-import ch.systemsx.cisd.common.parser.ParserException;
 import ch.systemsx.cisd.common.parser.TabFileLoader;
 import ch.systemsx.cisd.common.utilities.PropertyUtils;
 import ch.systemsx.cisd.openbis.generic.shared.dto.NewProperty;
@@ -97,20 +92,7 @@ public abstract class AbstractDataSetInfoExtractor implements IDataSetInfoExtrac
             if (propertiesFile.isFile())
             {
                 TabFileLoader<NewProperty> tabFileLoader =
-                        new TabFileLoader<NewProperty>(
-                                new IParserObjectFactoryFactory<NewProperty>()
-                                    {
-
-                                        public IParserObjectFactory<NewProperty> createFactory(
-                                                IPropertyMapper propertyMapper)
-                                                throws ParserException
-                                        {
-                                            return new AbstractParserObjectFactory<NewProperty>(
-                                                    NewProperty.class, propertyMapper)
-                                                {
-                                                };
-                                        }
-                                    });
+                        new TabFileLoader<NewProperty>(NewProperty.class);
                 result.addAll(tabFileLoader.load(propertiesFile));
 
             } else