diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerMDA.java b/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerMDA.java
index 870f9d1..05af6cd 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerMDA.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerMDA.java
@@ -453,11 +453,6 @@ public class DataDeserializerMDA implements DataDeserializer {
 	}
 }
 
-/**
- * Helper class
- * @author ebner
- *
- */
 class RecursiveReturnContainer{
 	private List<Message> message = new ArrayList<Message>();
 	private List<Metadata> metadata = new ArrayList<>();
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/DataVisualization.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/DataVisualization.java
index 5e7ad98..0c06e33 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/DataVisualization.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/DataVisualization.java
@@ -24,10 +24,6 @@ import java.util.List;
 
 import ch.psi.plot.Plot;
 
-/**
- * @author ebner
- *
- */
 public class DataVisualization {
 
 	private final Plot plot;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesArrayDataFilter.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesArrayDataFilter.java
index 18bdb30..81d9155 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesArrayDataFilter.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesArrayDataFilter.java
@@ -25,9 +25,6 @@ import ch.psi.plot.Plot;
  * Metadata of a group of XYSeries.
  * This metadata holds the information needed by the DataVisualizer
  * to plot series.
- * 
- * @author ebner
- *
  */
 public class XYSeriesArrayDataFilter implements SeriesDataFilter {
 	
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesDataFilter.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesDataFilter.java
index 3b087a1..52d8350 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesDataFilter.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesDataFilter.java
@@ -26,9 +26,6 @@ import ch.psi.plot.xy.XYSeriesP;
  * Metadata of a group of XYSeries.
  * This metadata holds the information needed by the DataVisualizer
  * to plot series.
- * 
- * @author ebner
- *
  */
 public class XYSeriesDataFilter implements SeriesDataFilter{
 	
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesArrayDataFilter.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesArrayDataFilter.java
index 8a04f56..edc3b9c 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesArrayDataFilter.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesArrayDataFilter.java
@@ -21,10 +21,6 @@ package ch.psi.fda.ui.visualizer;
 
 import ch.psi.plot.Plot;
 
-/**
- * @author ebner
- *
- */
 public class XYZSeriesArrayDataFilter implements SeriesDataFilter {
 
 	private final String idY;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesDataFilter.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesDataFilter.java
index daa0ab1..6795730 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesDataFilter.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesDataFilter.java
@@ -21,10 +21,6 @@ package ch.psi.fda.ui.visualizer;
 
 import ch.psi.plot.Plot;
 
-/**
- * @author ebner
- *
- */
 public class XYZSeriesDataFilter implements SeriesDataFilter {
 
 	private final String idX;
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerMDATest.java b/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerMDATest.java
index 4a184fb..1429178 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerMDATest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerMDATest.java
@@ -37,8 +37,6 @@ import ch.psi.fda.messages.Message;
 import ch.psi.fda.messages.Metadata;
 
 /**
- * @author ebner
- *
  * For testing whether the created MDA file is correct use following 
  * program on a SLS SL5 beamline console (or slslc05/06)
  */