diff --git a/src/main/java/kieker/analysis/util/JAXBMarshalElement.java b/src/main/java/kieker/analysis/util/JAXBMarshalElement.java
deleted file mode 100644
index c654147903f6f1fcf530ba8da13d1653b5459048..0000000000000000000000000000000000000000
--- a/src/main/java/kieker/analysis/util/JAXBMarshalElement.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package kieker.analysis.util;
-
-import java.io.OutputStream;
-
-import javax.xml.bind.JAXBElement;
-
-@Deprecated
-public class JAXBMarshalElement<T> {
-
-	private JAXBElement<T> element;
-
-	private OutputStream outputStream;
-
-	public JAXBMarshalElement(final JAXBElement<T> element, final OutputStream outputStream) {
-		this.element = element;
-		this.outputStream = outputStream;
-	}
-
-	public JAXBElement<T> getElement() {
-		return element;
-	}
-
-	public void setElement(final JAXBElement<T> element) {
-		this.element = element;
-	}
-
-	public OutputStream getOutputStream() {
-		return outputStream;
-	}
-
-	public void setOutputStream(final OutputStream outputStream) {
-		this.outputStream = outputStream;
-	}
-
-}
diff --git a/src/main/java/kieker/analysis/util/JAXBMarshalStageOld.java b/src/main/java/kieker/analysis/util/JAXBMarshalStageOld.java
deleted file mode 100644
index 6251e1df604b4abc141054247fc57ddeb06445fb..0000000000000000000000000000000000000000
--- a/src/main/java/kieker/analysis/util/JAXBMarshalStageOld.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package kieker.analysis.util;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-
-import teetime.framework.AbstractConsumerStage;
-
-/**
- * This stage marshals the content tree rooted at an incoming element into an
- * output stream.
- *
- * A class object has to be passed at creation. Only elements of this type
- * wrapped in a {@code JAXBElement} could be marshaled.
- *
- * Incoming elements must be {@code JAXBMarshalElement} which stores the
- * {@code JAXBElement} and an output stream.
- *
- * @author Sören Henning
- *
- */
-@Deprecated
-public class JAXBMarshalStageOld<T> extends AbstractConsumerStage<JAXBMarshalElement<T>> {
-
-	private static final Boolean FORMATTED_OUTPUT_DEFAULT = Boolean.TRUE;
-
-	private final Marshaller marshaller;
-
-	public JAXBMarshalStageOld(final Class<T> elementsClass) {
-		this(elementsClass, FORMATTED_OUTPUT_DEFAULT);
-	}
-
-	public JAXBMarshalStageOld(final Class<T> elementsClass, final Boolean formattedOutput) {
-		try {
-			this.marshaller = JAXBContext.newInstance(elementsClass).createMarshaller();
-			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, formattedOutput);
-		} catch (JAXBException e) {
-			// TODO Exception
-			throw new IllegalStateException(e);
-		}
-	}
-
-	@Override
-	protected void execute(final JAXBMarshalElement<T> element) {
-		try {
-			marshaller.marshal(element.getElement(), element.getOutputStream());
-		} catch (JAXBException e) {
-			// TODO Exception
-			throw new IllegalStateException("The received element could not be marshalled.", e);
-		}
-	}
-
-}