--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation6.java	Thu Oct 30 14:20:28 2014 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation6.java	Thu Oct 30 15:03:55 2014 +0100
@@ -127,13 +127,12 @@
         ValuesCache vc = new ValuesCache();
 
         WQTimerange [] wqt = prepareData(refTable, dts, vc);
-        WQKms []       wqs = prepareWQData(dts, vc);
 
         if (debug) {
             log.debug("Number of calculation results: " + wqt.length);
         }
 
-        return new CalculationResult(new HistoricalDischargeData(wqt, wqs),
+        return new CalculationResult(new HistoricalDischargeData(wqt),
             this);
     }
 
@@ -196,32 +195,6 @@
         return !(timerange[1] < dtStart || timerange[0] > dtStop);
     }
 
-    protected WQKms[] prepareWQData(List<DischargeTable> dts, ValuesCache vc) {
-        WQKms[] wqs = new WQKms[dts.size()];
-
-        for (int i = 0, N = wqs.length; i < N; ++i) {
-            DischargeTable dt = dts.get(i);
-            wqs[i] = prepareWQ(dt, vc.getValues(dts.get(i)));
-        }
-
-        return wqs;
-    }
-
-    protected WQKms prepareWQ(DischargeTable dt, double[][] values) {
-        double datum = dt.getGauge().getDatum().doubleValue();
-        double km = dt.getGauge().getStation().doubleValue();
-
-        double[] kms = new double[values[1].length];
-        Arrays.fill(kms, km);
-
-        for (int i = 0 ; i < values[1].length; i++) {
-            values[1][i] = values[1][i]/100d + datum;
-        }
-
-        return new HistoricalWQKms(kms, values[0], values[1],
-            String.valueOf(km), dt.getTimeInterval());
-    }
-
     protected String name(double value) {
         return mode == EvaluationMode.W.getMode()
             ? "W=" + value