diff --git a/de.openms.knime.importers/src/de/openms/knime/importers/mzml/MzMLChromatogramImporter.java b/de.openms.knime.importers/src/de/openms/knime/importers/mzml/MzMLChromatogramImporter.java
index 2e73cd3..dbf83ad 100644
--- a/de.openms.knime.importers/src/de/openms/knime/importers/mzml/MzMLChromatogramImporter.java
+++ b/de.openms.knime.importers/src/de/openms/knime/importers/mzml/MzMLChromatogramImporter.java
@@ -13,11 +13,9 @@
 import org.knime.core.data.DataTableSpec;
 import org.knime.core.data.DataTableSpecCreator;
 import org.knime.core.data.RowKey;
-import org.knime.core.data.collection.CollectionCellFactory;
 import org.knime.core.data.collection.ListCell;
 import org.knime.core.data.def.DefaultRow;
 import org.knime.core.data.def.DoubleCell;
-import org.knime.core.data.def.IntCell;
 import org.knime.core.node.BufferedDataTable;
 import org.knime.core.node.port.PortObjectSpec;
 
@@ -27,8 +25,6 @@
 import uk.ac.ebi.jmzml.model.mzml.BinaryDataArray;
 import uk.ac.ebi.jmzml.model.mzml.CVParam;
 import uk.ac.ebi.jmzml.model.mzml.Chromatogram;
-import uk.ac.ebi.jmzml.model.mzml.Scan;
-import uk.ac.ebi.jmzml.model.mzml.Spectrum;
 import uk.ac.ebi.jmzml.xml.io.MzMLUnmarshaller;
 
 public class MzMLChromatogramImporter implements IDemangler {
diff --git a/de.openms.knime.importers/src/de/openms/knime/importers/mzml/MzMLSpectrumImporter.java b/de.openms.knime.importers/src/de/openms/knime/importers/mzml/MzMLSpectrumImporter.java
index 159ccb1..d5f82fa 100644
--- a/de.openms.knime.importers/src/de/openms/knime/importers/mzml/MzMLSpectrumImporter.java
+++ b/de.openms.knime.importers/src/de/openms/knime/importers/mzml/MzMLSpectrumImporter.java
@@ -13,7 +13,6 @@
 import org.knime.core.data.DataTableSpec;
 import org.knime.core.data.DataTableSpecCreator;
 import org.knime.core.data.RowKey;
-import org.knime.core.data.collection.CollectionCellFactory;
 import org.knime.core.data.collection.ListCell;
 import org.knime.core.data.def.DefaultRow;
 import org.knime.core.data.def.DoubleCell;
diff --git a/de.openms.knime.mzTab/src/de/openms/knime/mztab/MzTabReaderNodeModel.java b/de.openms.knime.mzTab/src/de/openms/knime/mztab/MzTabReaderNodeModel.java
index 4bb2616..89726c6 100644
--- a/de.openms.knime.mzTab/src/de/openms/knime/mztab/MzTabReaderNodeModel.java
+++ b/de.openms.knime.mzTab/src/de/openms/knime/mztab/MzTabReaderNodeModel.java
@@ -106,14 +106,12 @@ private DataTableSpec createMetaDataSectionSpec() {
      * Constructor for the node model.
      */
     protected MzTabReaderNodeModel() {
-		super(new PortType[] { new PortType(IURIPortObject.class) },
-				new PortType[] {
-						new PortType(BufferedDataTable.class),
-						new PortType(BufferedDataTable.class),
-						new PortType(BufferedDataTable.class), 
-						new PortType(BufferedDataTable.class),
-						new PortType(BufferedDataTable.class) 
-						});
+		super(new PortType[] { IURIPortObject.TYPE },
+				new PortType[] { BufferedDataTable.TYPE,
+						BufferedDataTable.TYPE,
+						BufferedDataTable.TYPE,
+						BufferedDataTable.TYPE,
+						BufferedDataTable.TYPE});
 
         metaDataRowIdx = 1;
         proteinRowIdx = 1;
diff --git a/de.openms.knime.mzTab/src/de/openms/knime/mztab/small_molecule/SmallMoleculeMzTabReaderNodeModel.java b/de.openms.knime.mzTab/src/de/openms/knime/mztab/small_molecule/SmallMoleculeMzTabReaderNodeModel.java
index 379a82e..4e490a1 100644
--- a/de.openms.knime.mzTab/src/de/openms/knime/mztab/small_molecule/SmallMoleculeMzTabReaderNodeModel.java
+++ b/de.openms.knime.mzTab/src/de/openms/knime/mztab/small_molecule/SmallMoleculeMzTabReaderNodeModel.java
@@ -93,8 +93,8 @@ public class SmallMoleculeMzTabReaderNodeModel extends NodeModel {
      * Constructor for the node model.
      */
     protected SmallMoleculeMzTabReaderNodeModel() {
-        super(new PortType[] { new PortType(IURIPortObject.class) },
-                new PortType[] { new PortType(BufferedDataTable.class) });
+        super(new PortType[] { IURIPortObject.TYPE },
+                new PortType[] { BufferedDataTable.TYPE });
     }
 
     /**
diff --git a/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcfeaturereader/QCFeatureReaderNodeModel.java b/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcfeaturereader/QCFeatureReaderNodeModel.java
index d5e7926..2910ba9 100644
--- a/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcfeaturereader/QCFeatureReaderNodeModel.java
+++ b/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcfeaturereader/QCFeatureReaderNodeModel.java
@@ -78,7 +78,7 @@ private static PortType[] getIncomingPorts() {
      * @return The outgoing {@link PortType}s of this node.
      */
     private static PortType[] getOutgoingPorts() {
-        return new PortType[] { new PortType(BufferedDataTable.class) };
+        return new PortType[] { BufferedDataTable.TYPE };
     }
 
     /**
diff --git a/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcidreader/QCIDReaderNodeModel.java b/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcidreader/QCIDReaderNodeModel.java
index 4be3930..f952864 100644
--- a/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcidreader/QCIDReaderNodeModel.java
+++ b/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcidreader/QCIDReaderNodeModel.java
@@ -79,7 +79,7 @@ private static PortType[] getIncomingPorts() {
      * @return The outgoing {@link PortType}s of this node.
      */
     private static PortType[] getOutgoingPorts() {
-        return new PortType[] { new PortType(BufferedDataTable.class) };
+        return new PortType[] { BufferedDataTable.TYPE };
     }
 
     /**
diff --git a/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcioninjectiontimereader/QCIonInjectionTimeReaderNodeModel.java b/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcioninjectiontimereader/QCIonInjectionTimeReaderNodeModel.java
index f776358..feefa4f 100644
--- a/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcioninjectiontimereader/QCIonInjectionTimeReaderNodeModel.java
+++ b/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcioninjectiontimereader/QCIonInjectionTimeReaderNodeModel.java
@@ -56,7 +56,7 @@ private static PortType[] getIncomingPorts() {
      * @return The outgoing {@link PortType}s of this node.
      */
     private static PortType[] getOutgoingPorts() {
-        return new PortType[] { new PortType(BufferedDataTable.class) };
+        return new PortType[] { BufferedDataTable.TYPE };
     }
 
     /**
diff --git a/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcprecursorreader/QCPrecursorReaderNodeModel.java b/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcprecursorreader/QCPrecursorReaderNodeModel.java
index 638c7a0..2fc84b9 100644
--- a/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcprecursorreader/QCPrecursorReaderNodeModel.java
+++ b/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcprecursorreader/QCPrecursorReaderNodeModel.java
@@ -76,7 +76,7 @@ private static PortType[] getIncomingPorts() {
      * @return The outgoing {@link PortType}s of this node.
      */
     private static PortType[] getOutgoingPorts() {
-        return new PortType[] { new PortType(BufferedDataTable.class) };
+        return new PortType[] { BufferedDataTable.TYPE };
     }
 
     /**
diff --git a/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcsetidreader/QCSetIdReaderNodeModel.java b/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcsetidreader/QCSetIdReaderNodeModel.java
index 80ff26a..74d1ae4 100644
--- a/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcsetidreader/QCSetIdReaderNodeModel.java
+++ b/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcsetidreader/QCSetIdReaderNodeModel.java
@@ -76,7 +76,7 @@ private static PortType[] getIncomingPorts() {
      * @return The outgoing {@link PortType}s of this node.
      */
     private static PortType[] getOutgoingPorts() {
-        return new PortType[] { new PortType(BufferedDataTable.class) };
+        return new PortType[] { BufferedDataTable.TYPE };
     }
 
     /**
diff --git a/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcticreader/QCTICReaderNodeModel.java b/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcticreader/QCTICReaderNodeModel.java
index e0c3b94..480f1c5 100644
--- a/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcticreader/QCTICReaderNodeModel.java
+++ b/de.openms.knime.qchandling/src/de/openms/knime/qchandling/qcticreader/QCTICReaderNodeModel.java
@@ -74,7 +74,7 @@ private static PortType[] getIncomingPorts() {
      * @return The outgoing {@link PortType}s of this node.
      */
     private static PortType[] getOutgoingPorts() {
-        return new PortType[] { new PortType(BufferedDataTable.class) };
+        return new PortType[] { BufferedDataTable.TYPE };
     }
 
     /**
diff --git a/de.openms.knime.textexporter_reader/src/de/openms/knime/consensusTextReader/ConsensusTextReaderNodeModel.java b/de.openms.knime.textexporter_reader/src/de/openms/knime/consensusTextReader/ConsensusTextReaderNodeModel.java
index 2231a37..2bf933e 100644
--- a/de.openms.knime.textexporter_reader/src/de/openms/knime/consensusTextReader/ConsensusTextReaderNodeModel.java
+++ b/de.openms.knime.textexporter_reader/src/de/openms/knime/consensusTextReader/ConsensusTextReaderNodeModel.java
@@ -43,7 +43,6 @@
 import org.knime.core.node.ExecutionContext;
 import org.knime.core.node.ExecutionMonitor;
 import org.knime.core.node.InvalidSettingsException;
-import org.knime.core.node.NodeLogger;
 import org.knime.core.node.NodeModel;
 import org.knime.core.node.NodeSettingsRO;
 import org.knime.core.node.NodeSettingsWO;
@@ -61,16 +60,12 @@
  */
 public class ConsensusTextReaderNodeModel extends NodeModel {
 
-    // the logger instance
-    private static final NodeLogger logger = NodeLogger
-            .getLogger(ConsensusTextReaderNodeModel.class);
-
     /**
      * Constructor for the node model.
      */
     protected ConsensusTextReaderNodeModel() {
-        super(new PortType[] { new PortType(IURIPortObject.class) },
-                new PortType[] { new PortType(BufferedDataTable.class) });
+        super(new PortType[] { IURIPortObject.TYPE },
+                new PortType[] { BufferedDataTable.TYPE });
     }
 
     /**
diff --git a/de.openms.knime.textexporter_reader/src/de/openms/knime/featureTextReader/FeatureTextReaderNodeModel.java b/de.openms.knime.textexporter_reader/src/de/openms/knime/featureTextReader/FeatureTextReaderNodeModel.java
index b007c75..1ebf8bb 100644
--- a/de.openms.knime.textexporter_reader/src/de/openms/knime/featureTextReader/FeatureTextReaderNodeModel.java
+++ b/de.openms.knime.textexporter_reader/src/de/openms/knime/featureTextReader/FeatureTextReaderNodeModel.java
@@ -13,7 +13,6 @@
 import org.knime.core.node.ExecutionContext;
 import org.knime.core.node.ExecutionMonitor;
 import org.knime.core.node.InvalidSettingsException;
-import org.knime.core.node.NodeLogger;
 import org.knime.core.node.NodeModel;
 import org.knime.core.node.NodeSettingsRO;
 import org.knime.core.node.NodeSettingsWO;
@@ -31,16 +30,12 @@
  */
 public class FeatureTextReaderNodeModel extends NodeModel {
 
-    // the logger instance
-    private static final NodeLogger logger = NodeLogger
-            .getLogger(FeatureTextReaderNodeModel.class);
-
     /**
      * Constructor for the node model.
      */
     protected FeatureTextReaderNodeModel() {
-        super(new PortType[] { new PortType(IURIPortObject.class) },
-                new PortType[] { new PortType(BufferedDataTable.class) });
+        super(new PortType[] { IURIPortObject.TYPE },
+                new PortType[] { BufferedDataTable.TYPE });
     }
 
     /**
diff --git a/de.openms.knime.textexporter_reader/src/de/openms/knime/idTextReader/IDTextReaderNodeModel.java b/de.openms.knime.textexporter_reader/src/de/openms/knime/idTextReader/IDTextReaderNodeModel.java
index 541c59c..764b144 100644
--- a/de.openms.knime.textexporter_reader/src/de/openms/knime/idTextReader/IDTextReaderNodeModel.java
+++ b/de.openms.knime.textexporter_reader/src/de/openms/knime/idTextReader/IDTextReaderNodeModel.java
@@ -43,7 +43,6 @@
 import org.knime.core.node.ExecutionContext;
 import org.knime.core.node.ExecutionMonitor;
 import org.knime.core.node.InvalidSettingsException;
-import org.knime.core.node.NodeLogger;
 import org.knime.core.node.NodeModel;
 import org.knime.core.node.NodeSettingsRO;
 import org.knime.core.node.NodeSettingsWO;
@@ -61,16 +60,12 @@
  */
 public class IDTextReaderNodeModel extends NodeModel {
 
-    // the logger instance
-    private static final NodeLogger logger = NodeLogger
-            .getLogger(IDTextReaderNodeModel.class);
-
     /**
      * Constructor for the node model.
      */
     protected IDTextReaderNodeModel() {
-        super(new PortType[] { new PortType(IURIPortObject.class) },
-                new PortType[] { new PortType(BufferedDataTable.class) });
+        super(new PortType[] { IURIPortObject.TYPE },
+                new PortType[] { BufferedDataTable.TYPE });
     }
 
     /**