--- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java	Tue Sep 25 16:43:51 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java	Wed Sep 26 15:48:05 2018 +0200
@@ -37,7 +37,6 @@
 import org.dive4elements.river.jfree.Bounds;
 import org.dive4elements.river.jfree.DoubleBounds;
 import org.dive4elements.river.jfree.RiverAnnotation;
-import org.dive4elements.river.jfree.StyledAreaSeriesCollection;
 import org.dive4elements.river.jfree.XYMetaSeriesCollection;
 import org.dive4elements.river.themes.ThemeDocument;
 import org.jfree.chart.ChartFactory;
@@ -51,7 +50,6 @@
 import org.jfree.chart.plot.Marker;
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.title.TextTitle;
 import org.jfree.data.Range;
 import org.jfree.data.general.Series;
 import org.jfree.data.xy.XYDataset;
@@ -442,67 +440,6 @@
     }
 
     /**
-     * Registers an area to be drawn.
-     * @param area Area to be drawn.
-     * @param axisName Name of the axis.
-     * @param visible Whether or not to be visible
-     *                (important for range calculations).
-     */
-    public void addAreaSeries(
-        StyledAreaSeriesCollection area,
-        String axisName,
-        boolean visible
-    ) {
-        addAreaSeries(area, diagramAttributes.getAxisIndex(axisName), visible);
-    }
-
-    /**
-     * Registers an area to be drawn.
-     * @param area Area to be drawn.
-     * @param index 'axis index'
-     * @param visible Whether or not to be visible
-     *                (important for range calculations).
-     */
-    public void addAreaSeries(
-        StyledAreaSeriesCollection area,
-        int index,
-        boolean visible
-    ) {
-        if (area == null) {
-            log.warn("Cannot yet render above/under curve.");
-            return;
-        }
-
-        AxisDataset axisDataset = (AxisDataset) getAxisDataset(index);
-
-        Bounds[] xyBounds = ChartHelper.getBounds(area);
-
-        if (xyBounds == null) {
-            log.warn("Skip XYDataset for Axis (invalid ranges): " + index);
-            return;
-        }
-        
-
-        if (visible) {
-            if (log.isDebugEnabled()) {
-                log.debug("Add new AxisDataset at index: " + index);
-                log.debug("X extent: " + xyBounds[0]);
-                log.debug("Y extent: " + xyBounds[1]);
-            }
-
-            axisDataset.addArea(area);
-        }
-
-        /* No range merging, for areas extending to infinity this causes problems. */
-        /* No range merging, for areas extending to infinity this causes problems. */
-        if( StyledSeriesBuilder.isBigDoubleValue( xyBounds[1].getLower() ) || StyledSeriesBuilder.isBigDoubleValue( xyBounds[1].getLower() ) )
-            return;
-        
-        combineXBounds(xyBounds[0], 0);
-        combineYBounds(xyBounds[1], index);
-    }
-
-    /**
      * Add given series if visible, if not visible adjust ranges (such that
      * all points in data would be plotted once visible).
      * @param series   the data series to include in plot.
@@ -1134,7 +1071,7 @@
     }
 
     protected final String getDefaultYAxisLabel(String axisName) {
-        Set labelSet = axesLabels.get(diagramAttributes.getAxisIndex(axisName));
+        Set<String> labelSet = axesLabels.get(diagramAttributes.getAxisIndex(axisName));
         log.debug("Labels for axis: " + labelSet);
         if (labelSet != null && !labelSet.isEmpty()) {
             String label = StringUtils.join(labelSet, ", ");