diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/LICENSE b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/LICENSE
deleted file mode 100644
index d645695673349e3947e8e5ae42332d0ac3164cd7..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/collector-2.0.jar b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/collector-2.0.jar
deleted file mode 100644
index 12b4a4271629fb57edad55ad2f4cbaf79a81dd71..0000000000000000000000000000000000000000
Binary files a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/collector-2.0.jar and /dev/null differ
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/jcommander-1.72.jar b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/jcommander-1.72.jar
deleted file mode 100644
index acb8e609b15cc2bf6142171c1bb4ddd2868483c6..0000000000000000000000000000000000000000
Binary files a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/jcommander-1.72.jar and /dev/null differ
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/log4j-1.2.17.jar b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/log4j-1.2.17.jar
deleted file mode 100644
index 1d425cf7d7e25f81be64d32c406ff66cfb6c4766..0000000000000000000000000000000000000000
Binary files a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/log4j-1.2.17.jar and /dev/null differ
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-api-1.7.25.jar b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-api-1.7.25.jar
deleted file mode 100644
index 0143c099699ee843cde6d95c9dbc7751039d2463..0000000000000000000000000000000000000000
Binary files a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-api-1.7.25.jar and /dev/null differ
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-log4j12-1.7.25.jar b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-log4j12-1.7.25.jar
deleted file mode 100644
index 7d88a6e75bcee54464e70f57a595cab677ce77fc..0000000000000000000000000000000000000000
Binary files a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-log4j12-1.7.25.jar and /dev/null differ
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/lib/.gitignore b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/lib/.gitignore
deleted file mode 100644
index 5e7d2734cfc60289debf74293817c0a8f572ff32..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/lib/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/log4j.cfg b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/log4j.cfg
deleted file mode 100644
index abb7ab0738e43ca47b15df352906d9b883c5ee17..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/log4j.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-# Root logger option
-log4j.rootLogger=INFO, stdout
-log4j.rootLogger=ERROR, stdout
-#log4j.rootLogger=DEBUG, stdout
-
-# Direct log messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1} - %m%n
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/moobench-2.0-all.jar b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/moobench-2.0-all.jar
deleted file mode 100644
index 02bc5205a4a6e3fac3bed94efd89757e085002ba..0000000000000000000000000000000000000000
Binary files a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/moobench-2.0-all.jar and /dev/null differ
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/README b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/README
deleted file mode 100644
index 25c23afd3c0d383ccc930f269f581948e43d0fb6..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/README
+++ /dev/null
@@ -1,9 +0,0 @@
-MooBench  http://kieker-monitoring.net/MooBench
------------------------------------------------
-
-The Overhead Evaluation Microbenchmark moved to its own git repository:
-
-  http://git.kieker-monitoring.net/moobench.git
-
-This directory contains a pre-compiled version of MooBench and the necessary scripts to start the benchmark of Kieker from Jenkins.
-
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh
deleted file mode 100755
index 9cb3a928ae6fb416edf80759f8193b5427932240..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-BASE_DIR=$(dirname $0)
-
-if [ "$1" == "" ] ; then
-	echo "Error: No computation node specified."
-	exit 1
-fi
-
-# The following constant specifies user name and address of the remote node executing the benchmark.
-# We recommend to use SSH keys for the access and to install Java (>= 1.6) and R (> 3.0) on the remote node.
-REMOTE_NODE="$1"
-
-# The following constant specifies location and name of the benchmarked jar file relative to the workspace.
-BENCHMARKED_JAR=build/libs/kieker-1.15-SNAPSHOT-aspectj.jar
-
-# The following constants specify location and name of the MooBench folder
-MOOBENCH_FOLDER=${BASE_DIR}/MooBench
-
-# The following constant specifies the name of the folder containing the results from MooBench
-RESULTS_FOLDER_NAME=results-kieker
-
-# This constant specifies the target file for the results
-RESULTS_TARGET_FILE=plot.csv
-
-# Copy the benchmarked file and MooBench to the remote node
-scp -r ${MOOBENCH_FOLDER} ${REMOTE_NODE}:MooBench
-# fix for KIEKER-1559: create empty folders "data" and "lib"
-ssh ${REMOTE_NODE} 'mkdir -p MooBench/data; mkdir -p MooBench/lib; exit'
-scp ${BENCHMARKED_JAR} ${REMOTE_NODE}:MooBench/lib
-
-# Execute MooBench
-ssh ${REMOTE_NODE} 'cd MooBench; chmod +x benchmark.sh; ./benchmark.sh; exit'
-
-# Copy results to workspace
-scp ${REMOTE_NODE}:MooBench/${RESULTS_FOLDER_NAME}/results-text.csv ${RESULTS_TARGET_FILE}
-
-# Save up to 100 results from previous benchmarks on the remote node and clean up
-BACKUP_FOLDER_NAME="$(date +%Y-%m-%d-%H-%M-%S)"
-ssh ${REMOTE_NODE} "mkdir old-results/${BACKUP_FOLDER_NAME}; cp MooBench/${RESULTS_FOLDER_NAME}/results.zip old-results/${BACKUP_FOLDER_NAME}/; exit"
-# A Non-Solaris OS could require "-d '\n'" for the xargs command
-ssh ${REMOTE_NODE} "cd old-results; ls -A1t | sed -e '1,100d' | xargs rm -rf; exit"
-ssh ${REMOTE_NODE} 'rm -rf MooBench; exit'
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh
deleted file mode 100755
index e74d7f79a8bf2d1f7bf28f5e94a5a66e9662ff3c..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-BASE_DIR=$(cd "$(dirname "$0")"; pwd)
-
-NUM_OF_REPEATS=100
-export RESULT_FILE="${BASE_DIR}/MooBench/results-kieker/results-text.csv"
-COLLECTED_DATA_FILE="${BASE_DIR}/results.csv"
-BENCHMARK="${BASE_DIR}/MooBench/benchmark.sh"
-#BENCHMARK="${BASE_DIR}/ex.sh"
-
-rm -f ${COLLECTED_DATA_FILE}
-
-for ((v=1;v<=${NUM_OF_REPEATS};v+=1)); do
-	echo "++++++++++++++++++++++++++"
-	echo "Rerun $v"
-	echo "++++++++++++++++++++++++++"
-	${BENCHMARK} # > /dev/null 2>&1
-	HEAD=`head -1 $RESULT_FILE`
-	VALUE=`tail -1 $RESULT_FILE`
-	if [ -f "${COLLECTED_DATA_FILE}" ] ; then
-		echo "$VALUE" >> ${COLLECTED_DATA_FILE}
-	else
-		echo "$HEAD" > ${COLLECTED_DATA_FILE}
-                echo "$VALUE" >> ${COLLECTED_DATA_FILE}
-	fi
-done
-
-# end
-
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.legacy.aop.xml b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.legacy.aop.xml
deleted file mode 100644
index a3e02fd16fe213174a8dfb2d151d4d0cda093477..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.legacy.aop.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.aspectj.org/dtd/aspectj_1_5_0.dtd">
-<aspectj>
-    <weaver options="">
-        <include within="mooBench.monitoredApplication.*"/>
-    </weaver>
-    <aspects>
-        <aspect name="kieker.monitoring.probe.aspectj.operationExecution.OperationExecutionAspectFull"/>
-    </aspects>
-</aspectj>
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.logging.properties b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.logging.properties
deleted file mode 100644
index f98649baf98e11754e888f5e06069b9dba5df31b..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.logging.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-handlers = java.util.logging.FileHandler
-java.util.logging.FileHandler.level = ALL
-java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
-java.util.logging.FileHandler.append = true
-java.util.logging.FileHandler.pattern = kieker.log
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.monitoring.properties b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.monitoring.properties
deleted file mode 100644
index 86af7e2c5aaa651378383fa87f937a8fc18693a1..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.monitoring.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-kieker.monitoring.enabled=true
-kieker.monitoring.name=KIEKER-BENCHMARK
-
-kieker.monitoring.adaptiveMonitoring.enabled=false
-kieker.monitoring.periodicSensorsExecutorPoolSize=0
-
-kieker.monitoring.writer.AsyncDummyWriter.QueueSize=100000
-kieker.monitoring.writer.AsyncDummyWriter.QueueFullBehavior=1
-
-kieker.monitoring.writer.filesystem.SyncFsWriter.bufferSize=16777216
-kieker.monitoring.writer.filesystem.SyncFsWriter.flush=false
-
-kieker.monitoring.writer.filesystem.AsyncFsWriter.QueueSize=100000
-kieker.monitoring.writer.filesystem.AsyncFsWriter.QueueFullBehavior=1
-kieker.monitoring.writer.filesystem.AsyncFsWriter.bufferSize=16777216
-kieker.monitoring.writer.filesystem.AsyncFsWriter.flush=false
-
-kieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.QueueSize=100000
-kieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.QueueFullBehavior=1
-kieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.bufferSize=16777216
-
-kieker.monitoring.writer.filesystem.AsyncBinaryZipWriter.QueueSize=100000
-kieker.monitoring.writer.filesystem.AsyncBinaryZipWriter.QueueFullBehavior=1
-kieker.monitoring.writer.filesystem.AsyncBinaryZipWriter.bufferSize=16777216
-
-kieker.monitoring.writer.tcp.TCPWriter.QueueFullBehavior=1
-kieker.monitoring.writer.tcp.TCPWriter.QueueSize=100000
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/application/MonitoredClassManualInstrumentation.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/application/MonitoredClassManualInstrumentation.java
deleted file mode 100644
index 41baec7e5fce6a46b96fc34bd681a7a7da5d7688..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/application/MonitoredClassManualInstrumentation.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/***************************************************************************
- * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ***************************************************************************/
-
-package moobench.application;
-
-import java.lang.management.ManagementFactory;
-import java.lang.management.ThreadMXBean;
-
-import kieker.common.record.flow.trace.TraceMetadata;
-import kieker.common.record.flow.trace.operation.AfterOperationEvent;
-import kieker.common.record.flow.trace.operation.BeforeOperationEvent;
-import kieker.monitoring.core.controller.IMonitoringController;
-import kieker.monitoring.core.controller.MonitoringController;
-import kieker.monitoring.core.registry.TraceRegistry;
-import kieker.monitoring.timer.ITimeSource;
-
-/**
- * @author Jan Waller
- */
-public final class MonitoredClassManualInstrumentation implements MonitoredClass {
-
-	private static final String SIGNATURE = "public final long moobench.application.MonitoredClass.monitoredMethod(long, int)";
-	private static final String CLAZZ = "moobench.application.MonitoredClass";
-
-	private static final IMonitoringController CTRLINST = MonitoringController.getInstance();
-	private static final ITimeSource TIME = CTRLINST.getTimeSource();
-	private static final TraceRegistry TRACEREGISTRY = TraceRegistry.INSTANCE;
-
-	final ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
-
-	/**
-	 * Default constructor.
-	 */
-	public MonitoredClassManualInstrumentation() {
-		// empty default constructor
-	}
-
-	public final long monitoredMethod(final long methodTime, final int recDepth) {
-		final boolean newTrace = MonitoredClassManualInstrumentation.triggerBefore();
-		long retval;
-		if (recDepth > 1) {
-			retval = this.monitoredMethod(methodTime, recDepth - 1);
-		} else {
-			final long exitTime = this.threadMXBean.getCurrentThreadUserTime() + methodTime;
-			long currentTime;
-			do {
-				currentTime = this.threadMXBean.getCurrentThreadUserTime();
-			} while (currentTime < exitTime);
-			retval = currentTime;
-		}
-		MonitoredClassManualInstrumentation.triggerAfter(newTrace);
-		return retval;
-	}
-
-	private final static boolean triggerBefore() {
-		if (!CTRLINST.isMonitoringEnabled()) {
-			return false;
-		}
-		final String signature = SIGNATURE;
-		if (!CTRLINST.isProbeActivated(signature)) {
-			return false;
-		}
-		TraceMetadata trace = TRACEREGISTRY.getTrace();
-		final boolean newTrace = trace == null;
-		if (newTrace) {
-			trace = TRACEREGISTRY.registerTrace();
-			CTRLINST.newMonitoringRecord(trace);
-		}
-		final long traceId = trace.getTraceId();
-		final String clazz = CLAZZ;
-		CTRLINST.newMonitoringRecord(new BeforeOperationEvent(TIME.getTime(), traceId, trace.getNextOrderId(), signature, clazz));
-		return newTrace;
-	}
-
-	private final static void triggerAfter(final boolean newTrace) {
-		final TraceMetadata trace = TRACEREGISTRY.getTrace();
-		if (null != trace) {
-			final String signature = SIGNATURE;
-			final String clazz = CLAZZ;
-			CTRLINST.newMonitoringRecord(new AfterOperationEvent(TIME.getTime(), trace.getTraceId(), trace.getNextOrderId(), signature, clazz));
-			if (newTrace) { // close the trace
-				TRACEREGISTRY.unregisterTrace();
-			}
-		}
-	}
-}
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/Logger.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/Logger.java
deleted file mode 100644
index 1ade79392d684fe5ef0d5b898318869c75c17cff..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/Logger.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ***************************************************************************/
-package moobench.kieker;
-
-import java.io.IOException;
-
-import moobench.benchmark.BenchmarkMain;
-
-/**
- * @author Jan Waller
- */
-public class Logger implements Runnable {
-
-	public void run() {
-		try {
-			java.util.logging.LogManager.getLogManager().readConfiguration(
-					BenchmarkMain.class.getClassLoader().getResourceAsStream("META-INF/kieker.logging.properties"));
-		} catch (final IOException ex) {
-			java.util.logging.Logger.getAnonymousLogger().log(java.util.logging.Level.SEVERE, "Could not load default logging.properties file", ex);
-		}
-	}
-}
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration1.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration1.java
deleted file mode 100644
index 0729de777254de71877fb52792749003a4899c79..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration1.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package moobench.kieker.tcp;
-
-import kieker.analysis.source.tcp.MultipleConnectionTcpSourceStage;
-import kieker.analysisteetime.plugin.filter.forward.CountingFilter;
-import teetime.framework.Configuration;
-
-public class TestConfiguration1 extends Configuration {
-
-	public TestConfiguration1(int inputPort, int bufferSize) {
-		MultipleConnectionTcpSourceStage source = new MultipleConnectionTcpSourceStage(inputPort, bufferSize, null);
-		CountingFilter counting = new CountingFilter();
-		
-		connectPorts(source.getOutputPort(), counting.getInputPort());
-	}
-}
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration2.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration2.java
deleted file mode 100644
index b5539001a4926afedb749ebecc25fb2f6fdd8331..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration2.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * 
- */
-package moobench.kieker.tcp;
-
-import java.util.concurrent.TimeUnit;
-
-import kieker.analysis.source.tcp.MultipleConnectionTcpSourceStage;
-import teetime.framework.Configuration;
-
-/**
- * @author reiner
- *
- */
-public class TestConfiguration2 extends Configuration {
-
-	public TestConfiguration2(int inputPort, int bufferSize) {
-		MultipleConnectionTcpSourceStage reader = new MultipleConnectionTcpSourceStage(inputPort, bufferSize, null);
-/*
-		final Configuration timeConfig = new Configuration();
-		final TimeReader timeReader = new TimeReader(timeConfig, analysisController);
-
-		final Configuration configTraceRecon = new Configuration();
-		configTraceRecon.setProperty(EventRecordTraceReconstructionFilter.CONFIG_PROPERTY_NAME_TIMEUNIT, TimeUnit.SECONDS.name());
-		configTraceRecon.setProperty(EventRecordTraceReconstructionFilter.CONFIG_PROPERTY_NAME_MAX_TRACE_DURATION, "1");
-		configTraceRecon.setProperty(EventRecordTraceReconstructionFilter.CONFIG_PROPERTY_NAME_MAX_TRACE_TIMEOUT, "1");
-		final EventRecordTraceReconstructionFilter traceRecon = new EventRecordTraceReconstructionFilter(configTraceRecon, analysisController);
-
-		analysisController.connect(reader, TCPReader.OUTPUT_PORT_NAME_RECORDS, traceRecon, EventRecordTraceReconstructionFilter.INPUT_PORT_NAME_TRACE_RECORDS);
-		analysisController.connect(timeReader, TimeReader.OUTPUT_PORT_NAME_TIMESTAMPS, traceRecon, EventRecordTraceReconstructionFilter.INPUT_PORT_NAME_TIME_EVENT);
-
-		final Configuration counterConfig = new Configuration();
-		final AnalysisThroughputFilter through = new AnalysisThroughputFilter(counterConfig, analysisController);
-		analysisController.connect(traceRecon, EventRecordTraceReconstructionFilter.OUTPUT_PORT_NAME_TRACE_VALID, through,
-				AnalysisThroughputFilter.INPUT_PORT_NAME_OBJECTS);
-		analysisController.connect(timeReader, TimeReader.OUTPUT_PORT_NAME_TIMESTAMPS, through, AnalysisThroughputFilter.INPUT_PORT_NAME_TIME);
-
-		final Configuration confTeeFilter = new Configuration();
-		confTeeFilter.setProperty(TeeFilter.CONFIG_PROPERTY_NAME_STREAM, TeeFilter.CONFIG_PROPERTY_VALUE_STREAM_STDOUT);
-		// confTeeFilter.setProperty(TeeFilter.CONFIG_PROPERTY_NAME_STREAM, TeeFilter.CONFIG_PROPERTY_VALUE_STREAM_NULL);
-		final TeeFilter teeFilter = new TeeFilter(confTeeFilter, analysisController);
-		analysisController.connect(through, AnalysisThroughputFilter.OUTPUT_PORT_NAME_THROUGHPUT, teeFilter, TeeFilter.INPUT_PORT_NAME_EVENTS);*/
-	
-	}
-}
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration3.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration3.java
deleted file mode 100644
index a33a4d613d4952d9cca213c56ab57e1239364449..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration3.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package moobench.kieker.tcp;
-
-import java.util.concurrent.TimeUnit;
-
-import kieker.analysis.source.tcp.MultipleConnectionTcpSourceStage;
-import teetime.framework.Configuration;
-
-public class TestConfiguration3 extends Configuration {
-
-	public TestConfiguration3(int inputPort, int bufferSize) {
-		MultipleConnectionTcpSourceStage source = new MultipleConnectionTcpSourceStage(inputPort, bufferSize, null);
-	
-		/*
-			final Configuration timeConfig = new Configuration();
-		final TimeReader timeReader = new TimeReader(timeConfig, analysisController);
-
-		final Configuration configTraceRecon = new Configuration();
-		configTraceRecon.setProperty(EventRecordTraceReconstructionFilter.CONFIG_PROPERTY_NAME_TIMEUNIT, TimeUnit.SECONDS.name());
-		configTraceRecon.setProperty(EventRecordTraceReconstructionFilter.CONFIG_PROPERTY_NAME_MAX_TRACE_DURATION, "1");
-		configTraceRecon.setProperty(EventRecordTraceReconstructionFilter.CONFIG_PROPERTY_NAME_MAX_TRACE_TIMEOUT, "1");
-		final EventRecordTraceReconstructionFilter traceRecon = new EventRecordTraceReconstructionFilter(configTraceRecon, analysisController);
-
-		analysisController.connect(reader, TCPReader.OUTPUT_PORT_NAME_RECORDS, traceRecon, EventRecordTraceReconstructionFilter.INPUT_PORT_NAME_TRACE_RECORDS);
-		analysisController.connect(timeReader, TimeReader.OUTPUT_PORT_NAME_TIMESTAMPS, traceRecon, EventRecordTraceReconstructionFilter.INPUT_PORT_NAME_TIME_EVENT);
-
-		final Configuration configTraceAggr = new Configuration();
-		configTraceAggr.setProperty(TraceAggregationFilter.CONFIG_PROPERTY_NAME_TIMEUNIT, TimeUnit.SECONDS.name());
-		configTraceAggr.setProperty(TraceAggregationFilter.CONFIG_PROPERTY_NAME_MAX_COLLECTION_DURATION, "1");
-		final TraceAggregationFilter traceAggr = new TraceAggregationFilter(configTraceAggr, analysisController);
-
-		analysisController.connect(traceRecon, EventRecordTraceReconstructionFilter.OUTPUT_PORT_NAME_TRACE_VALID, traceAggr,
-				TraceAggregationFilter.INPUT_PORT_NAME_TRACES);
-		analysisController.connect(timeReader, TimeReader.OUTPUT_PORT_NAME_TIMESTAMPS, traceAggr, TraceAggregationFilter.INPUT_PORT_NAME_TIME_EVENT);
-
-		final Configuration confTeeFilter = new Configuration();
-		confTeeFilter.setProperty(TeeFilter.CONFIG_PROPERTY_NAME_STREAM, TeeFilter.CONFIG_PROPERTY_VALUE_STREAM_STDOUT);
-		// confTeeFilter.setProperty(TeeFilter.CONFIG_PROPERTY_NAME_STREAM, TeeFilter.CONFIG_PROPERTY_VALUE_STREAM_NULL);
-		final TeeFilter teeFilter = new TeeFilter(confTeeFilter, analysisController);
-		analysisController.connect(traceAggr, TraceAggregationFilter.OUTPUT_PORT_NAME_TRACES, teeFilter, TeeFilter.INPUT_PORT_NAME_EVENTS);
-*/
-	}
-}
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment0.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment0.java
deleted file mode 100644
index 0460b57c66cfe345955d0bb92aad0aad4d652e09..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment0.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/***************************************************************************
- * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ***************************************************************************/
-
-package moobench.kieker.tcp;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-// Command-Line:
-// java -javaagent:lib/kieker-1.10-SNAPSHOT_aspectj.jar -Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.TCPWriter -Dkieker.monitoring.writer.tcp.TCPWriter.QueueFullBehavior=1 -jar dist\MooBench.jar --recursiondepth 10 --totalthreads 1 --methodtime 0 --output-filename raw.csv --totalcalls 10000000
-/**
- * @author Jan Waller
- */
-public final class TestExperiment0 {
-	private static final int PORT1 = 10133;
-	private static final int PORT2 = 10134;
-
-	final static AtomicInteger counter = new AtomicInteger(0);
-	final static AtomicLong totalBytes = new AtomicLong(0);
-
-	private TestExperiment0() {}
-
-	public static void main(final String[] args) throws InterruptedException {
-		final ScheduledThreadPoolExecutor executorService = new ScheduledThreadPoolExecutor(1);
-		executorService.scheduleAtFixedRate(new Runnable() {
-			public void run() {
-				final int bytes = TestExperiment0.counter.getAndSet(0);
-				totalBytes.addAndGet(bytes);
-				if (bytes > (1024 * 1024)) {
-					System.out.println("MB/s: " + (bytes / (1024 * 1024)));
-				} else if (bytes > 1024) {
-					System.out.println("KB/s: " + (bytes / 1024));
-				} else {
-					System.out.println(" B/s: " + bytes);
-				}
-			}
-		}, 0, 1, TimeUnit.SECONDS);
-
-		final Thread thread1 = new Thread(new SocketListener(PORT1));
-		final Thread thread2 = new Thread(new SocketListener(PORT2));
-
-		thread1.start();
-		thread2.start();
-
-		thread1.join();
-		thread2.join();
-		executorService.shutdown();
-		System.out.println("Total bytes read: " + totalBytes.get());
-	}
-}
-
-class SocketListener implements Runnable {
-	private static final int MESSAGE_BUFFER_SIZE = 65535;
-	private final int port;
-
-	public SocketListener(final int port) {
-		this.port = port;
-	}
-
-	public void run() {
-		ServerSocketChannel serversocket = null;
-		try {
-			serversocket = ServerSocketChannel.open();
-			serversocket.socket().bind(new InetSocketAddress(this.port));
-			System.out.println("Connected: " + this.port);
-			final SocketChannel socketChannel = serversocket.accept();
-			final ByteBuffer buffer = ByteBuffer.allocateDirect(MESSAGE_BUFFER_SIZE);
-			while (socketChannel.read(buffer) != -1) {
-				buffer.flip();
-				TestExperiment0.counter.addAndGet(buffer.remaining());
-				buffer.clear();
-			}
-			socketChannel.close();
-		} catch (final IOException ex) {
-			System.err.println("Error while reading: " + ex);
-		} finally {
-			if (null != serversocket) {
-				try {
-					serversocket.close();
-				} catch (final IOException e) {
-					System.err.println("Failed to close TCP connection!" + e);
-				}
-			}
-		}
-	}
-}
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment1.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment1.java
deleted file mode 100644
index b4a09a8b0f26a1193ab3eb98a3ec0657f123738b..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment1.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ***************************************************************************/
-
-package moobench.kieker.tcp;
-
-import teetime.framework.Execution;
-
-// Command-Line:
-// java -javaagent:lib/kieker-1.10-SNAPSHOT_aspectj.jar -Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.TCPWriter -Dkieker.monitoring.writer.tcp.TCPWriter.QueueFullBehavior=1 -jar dist\OverheadEvaluationMicrobenchmark.jar --recursiondepth 10 --totalthreads 1 --methodtime 0 --output-filename raw.csv --totalcalls 10000000
-/**
- * @author Jan Waller
- */
-public final class TestExperiment1 {
-
-	private TestExperiment1() {}
-
-	public static void main(final String[] args) {
-		TestConfiguration1 config = new TestConfiguration1(Integer.parseInt(args[0]), 8192);
-		Execution<TestConfiguration1> execution = new Execution<TestConfiguration1>(config);
-		execution.executeBlocking();
-	}
-}
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment2.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment2.java
deleted file mode 100644
index 663b038c8a1597a093bc69a0592591f3dceec214..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment2.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ***************************************************************************/
-
-package moobench.kieker.tcp;
-
-import java.util.concurrent.TimeUnit;
-
-import teetime.framework.Execution;
-
-// Command-Line:
-// java -javaagent:lib/kieker-1.10-SNAPSHOT_aspectj.jar -Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.TCPWriter -Dkieker.monitoring.writer.tcp.TCPWriter.QueueFullBehavior=1 -jar dist\OverheadEvaluationMicrobenchmark.jar --recursiondepth 10 --totalthreads 1 --methodtime 0 --output-filename raw.csv --totalcalls 10000000
-/**
- * @author Jan Waller
- */
-public final class TestExperiment2 {
-	
-	private TestExperiment2() {}
-
-	public static void main(final String[] args) {
-		TestConfiguration2 config = new TestConfiguration2(Integer.parseInt(args[0]), 8192);
-		Execution<TestConfiguration2> execution = new Execution<TestConfiguration2>(config);
-		execution.executeBlocking();
-	}
-
-}
diff --git a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment3.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment3.java
deleted file mode 100644
index 7a854fd36661de78302ac18d926709779fd11408..0000000000000000000000000000000000000000
--- a/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment3.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ***************************************************************************/
-
-package moobench.kieker.tcp;
-
-import java.util.concurrent.TimeUnit;
-
-import teetime.framework.Execution;
-
-// Command-Line:
-// java -javaagent:lib/kieker-1.10-SNAPSHOT_aspectj.jar -Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.TCPWriter -Dkieker.monitoring.writer.tcp.TCPWriter.QueueFullBehavior=1 -jar dist\OverheadEvaluationMicrobenchmark.jar --recursiondepth 10 --totalthreads 1 --methodtime 0 --output-filename raw.csv --totalcalls 10000000
-/**
- * @author Jan Waller
- */
-public final class TestExperiment3 {
-
-	private TestExperiment3() {}
-
-	public static void main(final String[] args) {
-		TestConfiguration3 config = new TestConfiguration3(Integer.parseInt(args[0]), 8192);
-		Execution<TestConfiguration3> execution = new Execution<TestConfiguration3>(config);
-		execution.executeBlocking();
-	}
-
-}
diff --git a/frameworks/Kieker-java/kieker.aop.xml b/frameworks/Kieker-java/kieker.aop.xml
index 8ebe6f38f83cf1e5213d8d74149c6801bfef0218..45cb6caea794d3101de2618d4b1a4e256a666d38 100644
--- a/frameworks/Kieker-java/kieker.aop.xml
+++ b/frameworks/Kieker-java/kieker.aop.xml
@@ -1,9 +1,10 @@
 <!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.aspectj.org/dtd/aspectj_1_5_0.dtd">
 <aspectj>
-    <weaver options="">
-        <include within="moobench.application.*"/>
-    </weaver>
-    <aspects>
-        <aspect name="kieker.monitoring.probe.aspectj.flow.operationExecution.FullInstrumentation" />
-    </aspects>
+  <weaver options="">
+    <include within="moobench.application.*" />
+  </weaver>
+  <aspects>
+    <aspect
+      name="kieker.monitoring.probe.aspectj.flow.operationExecution.FullInstrumentation" />
+  </aspects>
 </aspectj>