--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java	Mon Jul 02 17:40:39 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java	Mon Jul 02 19:01:09 2018 +0200
@@ -43,14 +43,12 @@
 
         @Override
         public String exportValue(final CallContext context, final Object value) {
-            // TODO Auto-generated method stub
-            return null;
+            throw new UnsupportedOperationException();
         }
 
         @Override
         protected NumberFormat createFormatter(final CallContext context) {
-            // TODO Auto-generated method stub
-            return null;
+            throw new UnsupportedOperationException();
         }
 
     };
@@ -87,54 +85,6 @@
         }
     };
 
-    public static final SInfoResultType mainValue1Duration = new SInfoResultType(null, "sinfo.flood_duration.header.mainvalue.1.duration",
-            "sinfo.flood_duration.header.pdf.mainvalue.1.duration") {
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public String exportValue(final CallContext context, final Object value) {
-            final double doubleValue = asDouble(value);
-            return exportDoubleValue(context, doubleValue);
-        }
-
-        @Override
-        protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getIntegerFormatter(context);
-        }
-    };
-
-    public static final SInfoResultType mainValue2Duration = new SInfoResultType(null, "sinfo.flood_duration.header.mainvalue.2.duration",
-            "sinfo.flood_duration.header.pdf.mainvalue.2.duration") {
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public String exportValue(final CallContext context, final Object value) {
-            final double doubleValue = asDouble(value);
-            return exportDoubleValue(context, doubleValue);
-        }
-
-        @Override
-        protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getIntegerFormatter(context);
-        }
-    };
-
-    public static final SInfoResultType mainValue3Duration = new SInfoResultType(null, "sinfo.flood_duration.header.mainvalue.3.duration",
-            "sinfo.flood_duration.header.pdf.mainvalue.3.duration") {
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public String exportValue(final CallContext context, final Object value) {
-            final double doubleValue = asDouble(value);
-            return exportDoubleValue(context, doubleValue);
-        }
-
-        @Override
-        protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getIntegerFormatter(context);
-        }
-    };
-
     public static final SInfoResultType waterlevel = new SInfoResultType(null, SInfoI18NStrings.CSV_WATERLEVEL_HEADER,
             "sinfo.export.flow_depth.pdf.header.waterlevel") {
         private static final long serialVersionUID = 1L;
@@ -185,21 +135,22 @@
         }
     };
 
-    public static final SInfoResultType waterlevel3 = new SInfoResultType(null, "sinfo.flood_duration.header.mainvalue.3.w",
-            "sinfo.flood_duration.header.pdf.mainvalue.3.w") {
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public String exportValue(final CallContext context, final Object value) {
-            final double doubleValue = asDouble(value);
-            return exportDoubleValue(context, doubleValue);
-        }
-
-        @Override
-        protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getFlowDepth(context);
-        }
-    };
+    // public static final SInfoResultType waterlevel3 = new SInfoResultType(null,
+    // "sinfo.flood_duration.header.mainvalue.3.w",
+    // "sinfo.flood_duration.header.pdf.mainvalue.3.w") {
+    // private static final long serialVersionUID = 1L;
+    //
+    // @Override
+    // public String exportValue(final CallContext context, final Object value) {
+    // final double doubleValue = asDouble(value);
+    // return exportDoubleValue(context, doubleValue);
+    // }
+    //
+    // @Override
+    // protected NumberFormat createFormatter(final CallContext context) {
+    // return Formatter.getFlowDepth(context);
+    // }
+    // };
 
     public static final SInfoResultType waterlevelLabel = new SInfoResultType(I18NStrings.UNIT_NONE, SInfoI18NStrings.CSV_LABEL_HEADER) {
         private static final long serialVersionUID = 1L;