diff --git a/README.md b/README.md
index 4d91839a..027e7239 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,8 @@
 [![Issue Count](https://codeclimate.com/github/intracom-telecom-sdn/nstat/badges/issue_count.svg)](https://codeclimate.com/github/intracom-telecom-sdn/nstat)
 [![Code Health](https://landscape.io/github/intracom-telecom-sdn/nstat/master/landscape.svg?style=flat)](https://landscape.io/github/intracom-telecom-sdn/nstat/master)
 [![Coverage Status](https://coveralls.io/repos/intracom-telecom-sdn/nstat/badge.svg?branch=master&service=github)](https://coveralls.io/github/intracom-telecom-sdn/nstat?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/2c0663990de243a09e986d4f30b59dd3)](https://www.codacy.com/app/kostis-g-papadopoulos/nstat?utm_source=github.com&utm_medium=referral&utm_content=intracom-telecom-sdn/nstat&utm_campaign=Badge_Grade)
+[![Code Issues](https://www.quantifiedcode.com/api/v1/project/fcb21ff93ae24832a562595afafcd94f/badge.svg)](https://www.quantifiedcode.com/app/project/fcb21ff93ae24832a562595afafcd94f)
 
 # NSTAT: Network Stress-Test Automation Toolkit
 
diff --git a/controllers/odl_beryllium_pb/build.sh b/controllers/odl_beryllium_pb/build.sh
index 88a4342e..96dea3a2 100755
--- a/controllers/odl_beryllium_pb/build.sh
+++ b/controllers/odl_beryllium_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_beryllium_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1
diff --git a/controllers/odl_beryllium_sr3_pb/build.sh b/controllers/odl_beryllium_sr3_pb/build.sh
index 19ddee4a..93a6c07b 100755
--- a/controllers/odl_beryllium_sr3_pb/build.sh
+++ b/controllers/odl_beryllium_sr3_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_beryllium_sr3_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1
diff --git a/controllers/odl_boron_pb/build.sh b/controllers/odl_boron_pb/build.sh
index d31bc8ff..71ae4441 100755
--- a/controllers/odl_boron_pb/build.sh
+++ b/controllers/odl_boron_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_boron_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1
diff --git a/controllers/odl_boron_sr2_pb/build.sh b/controllers/odl_boron_sr2_pb/build.sh
index ea1e8462..ebbf1dd0 100755
--- a/controllers/odl_boron_sr2_pb/build.sh
+++ b/controllers/odl_boron_sr2_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_boron_sr2_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1
diff --git a/controllers/odl_helium_sr3_pb/build.sh b/controllers/odl_helium_sr3_pb/build.sh
index e56ac75b..e88df439 100755
--- a/controllers/odl_helium_sr3_pb/build.sh
+++ b/controllers/odl_helium_sr3_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_helium_sr3_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1
diff --git a/controllers/odl_lithium_sr1_pb/build.sh b/controllers/odl_lithium_sr1_pb/build.sh
index 9cb34480..336468c4 100755
--- a/controllers/odl_lithium_sr1_pb/build.sh
+++ b/controllers/odl_lithium_sr1_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_lithium_sr1_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1
diff --git a/controllers/odl_lithium_sr2_pb/build.sh b/controllers/odl_lithium_sr2_pb/build.sh
index acf0c67b..da871d70 100755
--- a/controllers/odl_lithium_sr2_pb/build.sh
+++ b/controllers/odl_lithium_sr2_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_lithium_sr2_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1
diff --git a/controllers/odl_lithium_sr3_pb/build.sh b/controllers/odl_lithium_sr3_pb/build.sh
index 6a7a2dc3..aa38da62 100755
--- a/controllers/odl_lithium_sr3_pb/build.sh
+++ b/controllers/odl_lithium_sr3_pb/build.sh
@@ -17,7 +17,7 @@ NSTAT_SDN_CONTROLLER_LOCATION="https://github.com/intracom-telecom-sdn/nstat-sdn
 NSTAT_SDN_CONTROLLER_HANDLERS="controllers/odl_lithium_sr3_pb"
 
 if [ ! -d $SCRIPT_DIR/$NSTAT_SDN_CONTROLLER_HANDLERS ]; then
-    git clone -b master $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
+    git clone -b v.1.0 $NSTAT_SDN_CONTROLLER_LOCATION $SCRIPT_DIR/nstat-sdn-controllers""
     if [ $? -ne 0 ]; then
         echo "[build.sh] Cloning nstat-sdn-controllers failed. Exiting ..."
         exit 1
diff --git a/deploy/docker/no_proxy/Dockerfile b/deploy/docker/no_proxy/Dockerfile
index 50f2c651..fe9b4ff2 100755
--- a/deploy/docker/no_proxy/Dockerfile
+++ b/deploy/docker/no_proxy/Dockerfile
@@ -18,6 +18,8 @@ RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/ss
 RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
+RUN mkdir -p /root/.ssh
+RUN touch /root/.ssh/known_hosts
 RUN mkdir -p /home/root/.ssh
 RUN touch /home/root/.ssh/known_hosts
 EXPOSE 22
diff --git a/deploy/docker/proxy/Dockerfile b/deploy/docker/proxy/Dockerfile
index 7a22872b..096db7e8 100755
--- a/deploy/docker/proxy/Dockerfile
+++ b/deploy/docker/proxy/Dockerfile
@@ -30,6 +30,8 @@ RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/ss
 RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
+RUN mkdir -p /root/.ssh
+RUN touch /root/.ssh/known_hosts
 RUN mkdir -p /home/root/.ssh
 RUN touch /home/root/.ssh/known_hosts
 EXPOSE 22
diff --git a/emulators/nb_generator/build.sh b/emulators/nb_generator/build.sh
index 4220eb08..673c82f4 100755
--- a/emulators/nb_generator/build.sh
+++ b/emulators/nb_generator/build.sh
@@ -10,21 +10,21 @@
 SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 echo $SCRIPT_DIR
 
-NSTAT_NB_GENERATOR_LOCATION="https://github.com/intracom-telecom-sdn/nstat-nb-generator.git"
+NSTAT_NB_EMULATOR_LOCATION="https://github.com/intracom-telecom-sdn/nstat-nb-emulator.git"
 
-if [ ! -d $SCRIPT_DIR"/nstat-nb-generator" ]; then
-    git clone -b master $NSTAT_NB_GENERATOR_LOCATION $SCRIPT_DIR"/nstat-nb-generator"
+if [ ! -d $SCRIPT_DIR"/nstat-nb-emulator" ]; then
+    git clone -b v.1.0 $NSTAT_NB_EMULATOR_LOCATION $SCRIPT_DIR"/nstat-nb-emulator"
     if [ $? -ne 0 ]; then
-        echo "[build.sh] Cloning nstat-nb-generator failed. Exiting ..."
+        echo "[build.sh] Cloning nstat-nb-emulator failed. Exiting ..."
         exit 1
     fi
-    rm -rf $SCRIPT_DIR"/nstat-nb-generator/.git"
-    mv $SCRIPT_DIR/nstat-nb-generator/* $SCRIPT_DIR
+    rm -rf $SCRIPT_DIR"/nstat-nb-emulator/.git"
+    mv $SCRIPT_DIR/nstat-nb-emulator/* $SCRIPT_DIR
     if [ $? -ne 0 ]; then
-        echo "[build.sh] Moving nstat-nb-generator files failed. Exiting ..."
+        echo "[build.sh] Moving nstat-nb-emulator files failed. Exiting ..."
         exit 1
     fi
-    rm -rf $SCRIPT_DIR/nstat-nb-generator
+    rm -rf $SCRIPT_DIR/nstat-nb-emulator
 fi
 
-echo "[build.sh] Building nstat-nb-generator completed successfully"
\ No newline at end of file
+echo "[build.sh] Building nstat-nb-emulator completed successfully"
\ No newline at end of file
diff --git a/emulators/nb_generator/clean.sh b/emulators/nb_generator/clean.sh
index 5d0741c1..49b267c9 100755
--- a/emulators/nb_generator/clean.sh
+++ b/emulators/nb_generator/clean.sh
@@ -14,10 +14,10 @@ for item in $( ls -1 $SCRIPT_DIR ); do
     if [ $item != 'build.sh' ] && [ $item != 'clean.sh' ]; then
         rm -rf $SCRIPT_DIR/$item
         if [ $? -ne 0 ]; then
-            echo "[clean.sh] Cleanup of nstat-nb-generator failed. Exiting ..."
+            echo "[clean.sh] Cleanup of nstat-nb-emulator failed. Exiting ..."
             exit 1
         fi
     fi
 done
 
-echo "[clean.sh] Cleanup of nstat-nb-generator completed successfully"
\ No newline at end of file
+echo "[clean.sh] Cleanup of nstat-nb-emulator completed successfully"
\ No newline at end of file
diff --git a/stress_test/controller.py b/stress_test/controller.py
index 04186500..6e9663a4 100755
--- a/stress_test/controller.py
+++ b/stress_test/controller.py
@@ -40,7 +40,6 @@ def __init__(self, ctrl_base_dir, test_config):
         self.ssh_user = test_config['controller_node_username']
         self.ssh_pass = test_config['controller_node_password']
 
-        self.need_cleanup = test_config['controller_cleanup']
         self.of_port = test_config['controller_port']
         self.logs_dir = self.base_dir + test_config['controller_logs_dir']
 
diff --git a/stress_test/monitor.py b/stress_test/monitor.py
index d79e7c08..818424ab 100644
--- a/stress_test/monitor.py
+++ b/stress_test/monitor.py
@@ -665,7 +665,6 @@ def monitor_thread_active(self):
         results = self.system_results()
         results['global_sample_id'] = self.global_sample_id
         self.global_sample_id += 1
-        results['test_repeats'] = self.test_repeats
         results['multinet_workers'] = len(self.emulator.workers_ips)
         results['multinet_size'] = \
             self.emulator.topo_size * len(self.emulator.workers_ips)
diff --git a/stress_test/report_spec_templates.py b/stress_test/report_spec_templates.py
index 3dc66005..da005c5c 100644
--- a/stress_test/report_spec_templates.py
+++ b/stress_test/report_spec_templates.py
@@ -328,8 +328,7 @@ def sb_active_scalability_multinet(self, results_json_file):
             '{0}'.format(self.test_type),
             [stress_test.report_spec.TableSpec(
                 '1d', 'Test configuration parameters (detailed)',
-                [('test_repeats', 'Test repeats'),
-                 ('controller_name', 'Controller name'),
+                [('controller_name', 'Controller name'),
                  ('controller_build_handler', 'Controller build script'),
                  ('controller_start_handler', 'Controller start script'),
                  ('controller_stop_handler', 'Controller stop script'),
@@ -368,8 +367,6 @@ def sb_active_scalability_multinet(self, results_json_file):
                 [('global_sample_id', 'Sample ID'),
                  ('timestamp', 'Sample timestamp (seconds)'),
                  ('date', 'Sample timestamp (date)'),
-                 ('test_repeats', 'Total test repeats'),
-                 ('repeat_id', 'External repeat ID'),
                  ('of_out_bytes_per_sec',
                   'Outgoing controller throughput '
                   '(Bytes per second)'),
diff --git a/stress_test/sample_test_confs/boron/boron_DS_sb_active_scalability_mtcbench.json b/stress_test/sample_test_confs/boron/boron_DS_sb_active_scalability_mtcbench.json
index 0800c2ab..2fd6b093 100755
--- a/stress_test/sample_test_confs/boron/boron_DS_sb_active_scalability_mtcbench.json
+++ b/stress_test/sample_test_confs/boron/boron_DS_sb_active_scalability_mtcbench.json
@@ -33,7 +33,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/sample_test_confs/boron/boron_DS_sb_active_stability_mtcbench.json b/stress_test/sample_test_confs/boron/boron_DS_sb_active_stability_mtcbench.json
index 2fa63287..f0e9bb21 100755
--- a/stress_test/sample_test_confs/boron/boron_DS_sb_active_stability_mtcbench.json
+++ b/stress_test/sample_test_confs/boron/boron_DS_sb_active_stability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/sample_test_confs/boron/boron_DS_sb_idle_scalability_mtcbench.json b/stress_test/sample_test_confs/boron/boron_DS_sb_idle_scalability_mtcbench.json
index e9bf0c12..50111188 100755
--- a/stress_test/sample_test_confs/boron/boron_DS_sb_idle_scalability_mtcbench.json
+++ b/stress_test/sample_test_confs/boron/boron_DS_sb_idle_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/sample_test_confs/boron/boron_RPC_sb_active_scalability_mtcbench.json b/stress_test/sample_test_confs/boron/boron_RPC_sb_active_scalability_mtcbench.json
index 03cc154d..089faf72 100755
--- a/stress_test/sample_test_confs/boron/boron_RPC_sb_active_scalability_mtcbench.json
+++ b/stress_test/sample_test_confs/boron/boron_RPC_sb_active_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/sample_test_confs/boron/boron_RPC_sb_active_stability_mtcbench.json b/stress_test/sample_test_confs/boron/boron_RPC_sb_active_stability_mtcbench.json
index f60906f8..6787655b 100755
--- a/stress_test/sample_test_confs/boron/boron_RPC_sb_active_stability_mtcbench.json
+++ b/stress_test/sample_test_confs/boron/boron_RPC_sb_active_stability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/sample_test_confs/boron/boron_RPC_sb_idle_scalability_mtcbench.json b/stress_test/sample_test_confs/boron/boron_RPC_sb_idle_scalability_mtcbench.json
index 86734684..c1e3da9e 100755
--- a/stress_test/sample_test_confs/boron/boron_RPC_sb_idle_scalability_mtcbench.json
+++ b/stress_test/sample_test_confs/boron/boron_RPC_sb_idle_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/sample_test_confs/boron/boron_nb_active_scalability_multinet.json b/stress_test/sample_test_confs/boron/boron_nb_active_scalability_multinet.json
index 29bc58fe..bb328a1a 100755
--- a/stress_test/sample_test_confs/boron/boron_nb_active_scalability_multinet.json
+++ b/stress_test/sample_test_confs/boron/boron_nb_active_scalability_multinet.json
@@ -40,7 +40,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/sample_test_confs/boron/boron_sb_active_scalability_multinet.json b/stress_test/sample_test_confs/boron/boron_sb_active_scalability_multinet.json
index 4028a2a3..41dbb670 100755
--- a/stress_test/sample_test_confs/boron/boron_sb_active_scalability_multinet.json
+++ b/stress_test/sample_test_confs/boron/boron_sb_active_scalability_multinet.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
@@ -70,8 +69,6 @@
 
 "java_opts":["-Xmx2G","-Xms2G","-XX:+UseG1GC","-XX:MaxPermSize=512M"],
 
-"test_repeats":2,
-
 "plots":[
     {
         "x_axis_key":"multinet_size",
diff --git a/stress_test/sample_test_confs/boron/boron_sb_idle_scalability_multinet.json b/stress_test/sample_test_confs/boron/boron_sb_idle_scalability_multinet.json
index 0511a25f..86c00246 100755
--- a/stress_test/sample_test_confs/boron/boron_sb_idle_scalability_multinet.json
+++ b/stress_test/sample_test_confs/boron/boron_sb_idle_scalability_multinet.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/sample_test_confs/boron/boron_sb_idle_stability_multinet.json b/stress_test/sample_test_confs/boron/boron_sb_idle_stability_multinet.json
index ffe0c7c9..9c017c4c 100755
--- a/stress_test/sample_test_confs/boron/boron_sb_idle_stability_multinet.json
+++ b/stress_test/sample_test_confs/boron/boron_sb_idle_stability_multinet.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":2000,
diff --git a/stress_test/stress_test_confs/beryllium/beryllium_DS_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/beryllium/beryllium_DS_sb_active_scalability_mtcbench.json
index 55ac2111..6f6a9780 100644
--- a/stress_test/stress_test_confs/beryllium/beryllium_DS_sb_active_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/beryllium/beryllium_DS_sb_active_scalability_mtcbench.json
@@ -33,7 +33,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/beryllium/beryllium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/stress_test/stress_test_confs/beryllium/beryllium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
index 68b6e486..8a30d3e2 100644
--- a/stress_test/stress_test_confs/beryllium/beryllium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
+++ b/stress_test/stress_test_confs/beryllium/beryllium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_active_scalability_mtcbench.json
index b9ceceba..8e3dfa23 100644
--- a/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_active_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_active_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
index be92bb22..327d7bc9 100644
--- a/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
+++ b/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_idle_scalability_mtcbench.json b/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_idle_scalability_mtcbench.json
index 967f5541..6b6668ce 100644
--- a/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_idle_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/beryllium/beryllium_RPC_sb_idle_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/beryllium/beryllium_nb_active_scalability_multinet.json b/stress_test/stress_test_confs/beryllium/beryllium_nb_active_scalability_multinet.json
index 7945e8d1..20b3d01b 100755
--- a/stress_test/stress_test_confs/beryllium/beryllium_nb_active_scalability_multinet.json
+++ b/stress_test/stress_test_confs/beryllium/beryllium_nb_active_scalability_multinet.json
@@ -40,7 +40,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL (Beryllium)",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/beryllium/beryllium_sb_active_scalability_multinet_LinearTopo.json b/stress_test/stress_test_confs/beryllium/beryllium_sb_active_scalability_multinet_LinearTopo.json
index 1ce4a914..6499cf62 100644
--- a/stress_test/stress_test_confs/beryllium/beryllium_sb_active_scalability_multinet_LinearTopo.json
+++ b/stress_test/stress_test_confs/beryllium/beryllium_sb_active_scalability_multinet_LinearTopo.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
@@ -70,8 +69,6 @@
 
 "java_opts":["-Xmx2G","-Xms2G","-XX:+UseG1GC","-XX:MaxPermSize=512M"],
 
-"test_repeats":2,
-
 "plots":[
     {
         "x_axis_key":"multinet_size",
diff --git a/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_scalability_multinet_DisconnectedTopo.json b/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_scalability_multinet_DisconnectedTopo.json
index 5b8ff9e1..053f6b5f 100755
--- a/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_scalability_multinet_DisconnectedTopo.json
+++ b/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_scalability_multinet_DisconnectedTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_scalability_multinet_LinearTopo.json b/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_scalability_multinet_LinearTopo.json
index d689f816..2ee73465 100755
--- a/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_scalability_multinet_LinearTopo.json
+++ b/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_scalability_multinet_LinearTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_stability_multinet.json b/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_stability_multinet.json
index 8c818214..9bd219d1 100644
--- a/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_stability_multinet.json
+++ b/stress_test/stress_test_confs/beryllium/beryllium_sb_idle_stability_multinet.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.4.0-Beryllium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":5000,
diff --git a/stress_test/stress_test_confs/boron/boron_DS_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/boron/boron_DS_sb_active_scalability_mtcbench.json
index ef26ef8a..5304d5f2 100644
--- a/stress_test/stress_test_confs/boron/boron_DS_sb_active_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/boron/boron_DS_sb_active_scalability_mtcbench.json
@@ -33,7 +33,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/boron/boron_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/stress_test/stress_test_confs/boron/boron_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
index 37b4f447..9a29785c 100644
--- a/stress_test/stress_test_confs/boron/boron_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
+++ b/stress_test/stress_test_confs/boron/boron_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/boron/boron_RPC_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/boron/boron_RPC_sb_active_scalability_mtcbench.json
index 5627fa27..9d1d0e04 100644
--- a/stress_test/stress_test_confs/boron/boron_RPC_sb_active_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/boron/boron_RPC_sb_active_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/boron/boron_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/stress_test/stress_test_confs/boron/boron_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
index e1d4fcb2..af65a822 100644
--- a/stress_test/stress_test_confs/boron/boron_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
+++ b/stress_test/stress_test_confs/boron/boron_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/boron/boron_RPC_sb_idle_scalability_mtcbench.json b/stress_test/stress_test_confs/boron/boron_RPC_sb_idle_scalability_mtcbench.json
index 1b8fe8f5..9f65a9c2 100644
--- a/stress_test/stress_test_confs/boron/boron_RPC_sb_idle_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/boron/boron_RPC_sb_idle_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/boron/boron_nb_active_scalability_multinet.json b/stress_test/stress_test_confs/boron/boron_nb_active_scalability_multinet.json
index 00f09cee..9701b368 100755
--- a/stress_test/stress_test_confs/boron/boron_nb_active_scalability_multinet.json
+++ b/stress_test/stress_test_confs/boron/boron_nb_active_scalability_multinet.json
@@ -40,7 +40,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL (Boron)",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/boron/boron_sb_active_scalability_multinet_LinearTopo.json b/stress_test/stress_test_confs/boron/boron_sb_active_scalability_multinet_LinearTopo.json
index dc3cb9a1..4c6a1a6d 100644
--- a/stress_test/stress_test_confs/boron/boron_sb_active_scalability_multinet_LinearTopo.json
+++ b/stress_test/stress_test_confs/boron/boron_sb_active_scalability_multinet_LinearTopo.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
@@ -70,8 +69,6 @@
 
 "java_opts":["-Xmx2G","-Xms2G","-XX:+UseG1GC","-XX:MaxPermSize=512M"],
 
-"test_repeats":2,
-
 "plots":[
     {
         "x_axis_key":"multinet_size",
diff --git a/stress_test/stress_test_confs/boron/boron_sb_idle_scalability_multinet_DisconnectedTopo.json b/stress_test/stress_test_confs/boron/boron_sb_idle_scalability_multinet_DisconnectedTopo.json
index d96b7bb3..d205a4d3 100755
--- a/stress_test/stress_test_confs/boron/boron_sb_idle_scalability_multinet_DisconnectedTopo.json
+++ b/stress_test/stress_test_confs/boron/boron_sb_idle_scalability_multinet_DisconnectedTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/boron/boron_sb_idle_scalability_multinet_LinearTopo.json b/stress_test/stress_test_confs/boron/boron_sb_idle_scalability_multinet_LinearTopo.json
index f4e25491..32a005a6 100755
--- a/stress_test/stress_test_confs/boron/boron_sb_idle_scalability_multinet_LinearTopo.json
+++ b/stress_test/stress_test_confs/boron/boron_sb_idle_scalability_multinet_LinearTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/boron/boron_sb_idle_stability_multinet.json b/stress_test/stress_test_confs/boron/boron_sb_idle_stability_multinet.json
index c918030d..436b98b4 100644
--- a/stress_test/stress_test_confs/boron/boron_sb_idle_stability_multinet.json
+++ b/stress_test/stress_test_confs/boron/boron_sb_idle_stability_multinet.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Boron/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":5000,
diff --git a/stress_test/stress_test_confs/helium_sr3/helium_DS_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/helium_sr3/helium_DS_sb_active_scalability_mtcbench.json
index bf49ba70..5395e8d0 100644
--- a/stress_test/stress_test_confs/helium_sr3/helium_DS_sb_active_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/helium_sr3/helium_DS_sb_active_scalability_mtcbench.json
@@ -33,7 +33,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.0-SNAPSHOT/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/helium_sr3/helium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/stress_test/stress_test_confs/helium_sr3/helium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
index f2f471a6..22a44c75 100644
--- a/stress_test/stress_test_confs/helium_sr3/helium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
+++ b/stress_test/stress_test_confs/helium_sr3/helium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.0-SNAPSHOT/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/helium_sr3/helium_RPC_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/helium_sr3/helium_RPC_sb_active_scalability_mtcbench.json
index 308cacf6..f63c6ea4 100644
--- a/stress_test/stress_test_confs/helium_sr3/helium_RPC_sb_active_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/helium_sr3/helium_RPC_sb_active_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.0-SNAPSHOT/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/helium_sr3/helium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/stress_test/stress_test_confs/helium_sr3/helium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
index 699aff4e..99ac2d5a 100644
--- a/stress_test/stress_test_confs/helium_sr3/helium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
+++ b/stress_test/stress_test_confs/helium_sr3/helium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.0-SNAPSHOT/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/helium_sr3/helium_RPC_sb_idle_scalability_mtcbench.json b/stress_test/stress_test_confs/helium_sr3/helium_RPC_sb_idle_scalability_mtcbench.json
index 9d31a95e..0c8e6b1d 100644
--- a/stress_test/stress_test_confs/helium_sr3/helium_RPC_sb_idle_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/helium_sr3/helium_RPC_sb_idle_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.0-SNAPSHOT/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/helium_sr3/helium_nb_active_scalability_multinet.json b/stress_test/stress_test_confs/helium_sr3/helium_nb_active_scalability_multinet.json
index 4af34b0d..f245cdd0 100755
--- a/stress_test/stress_test_confs/helium_sr3/helium_nb_active_scalability_multinet.json
+++ b/stress_test/stress_test_confs/helium_sr3/helium_nb_active_scalability_multinet.json
@@ -40,7 +40,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.0-SNAPSHOT/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL (Helium)",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/helium_sr3/helium_sb_active_scalability_multinet_LinearTopo.json b/stress_test/stress_test_confs/helium_sr3/helium_sb_active_scalability_multinet_LinearTopo.json
index 9ccc5093..8848266a 100644
--- a/stress_test/stress_test_confs/helium_sr3/helium_sb_active_scalability_multinet_LinearTopo.json
+++ b/stress_test/stress_test_confs/helium_sr3/helium_sb_active_scalability_multinet_LinearTopo.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.0-SNAPSHOT/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
@@ -70,8 +69,6 @@
 
 "java_opts":["-Xmx2G","-Xms2G","-XX:+UseG1GC","-XX:MaxPermSize=512M"],
 
-"test_repeats":2,
-
 "plots":[
     {
         "x_axis_key":"multinet_size",
diff --git a/stress_test/stress_test_confs/helium_sr3/helium_sb_idle_scalability_multinet_DisconnectedTopo.json b/stress_test/stress_test_confs/helium_sr3/helium_sb_idle_scalability_multinet_DisconnectedTopo.json
index 2a26087f..d0ac9b46 100755
--- a/stress_test/stress_test_confs/helium_sr3/helium_sb_idle_scalability_multinet_DisconnectedTopo.json
+++ b/stress_test/stress_test_confs/helium_sr3/helium_sb_idle_scalability_multinet_DisconnectedTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.0-SNAPSHOT/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/helium_sr3/helium_sb_idle_scalability_multinet_LinearTopo.json b/stress_test/stress_test_confs/helium_sr3/helium_sb_idle_scalability_multinet_LinearTopo.json
index 999de048..c0580061 100755
--- a/stress_test/stress_test_confs/helium_sr3/helium_sb_idle_scalability_multinet_LinearTopo.json
+++ b/stress_test/stress_test_confs/helium_sr3/helium_sb_idle_scalability_multinet_LinearTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.0-SNAPSHOT/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/helium_sr3/helium_sb_idle_stability_multinet.json b/stress_test/stress_test_confs/helium_sr3/helium_sb_idle_stability_multinet.json
index 12f84c78..6e9f159d 100644
--- a/stress_test/stress_test_confs/helium_sr3/helium_sb_idle_stability_multinet.json
+++ b/stress_test/stress_test_confs/helium_sr3/helium_sb_idle_stability_multinet.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.0-SNAPSHOT/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":5000,
diff --git a/stress_test/stress_test_confs/lithium_sr1/lithium_DS_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/lithium_sr1/lithium_DS_sb_active_scalability_mtcbench.json
index 1e38b9ab..4fe0dff0 100644
--- a/stress_test/stress_test_confs/lithium_sr1/lithium_DS_sb_active_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/lithium_sr1/lithium_DS_sb_active_scalability_mtcbench.json
@@ -33,7 +33,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.1-Lithium-SR1/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr1/lithium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/stress_test/stress_test_confs/lithium_sr1/lithium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
index 16cbdb72..2129cb56 100644
--- a/stress_test/stress_test_confs/lithium_sr1/lithium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
+++ b/stress_test/stress_test_confs/lithium_sr1/lithium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.1-Lithium-SR1/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr1/lithium_RPC_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/lithium_sr1/lithium_RPC_sb_active_scalability_mtcbench.json
index 6f30a621..47405389 100644
--- a/stress_test/stress_test_confs/lithium_sr1/lithium_RPC_sb_active_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/lithium_sr1/lithium_RPC_sb_active_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.1-Lithium-SR1/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr1/lithium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/stress_test/stress_test_confs/lithium_sr1/lithium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
index f2c2ffc3..8c4689d1 100644
--- a/stress_test/stress_test_confs/lithium_sr1/lithium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
+++ b/stress_test/stress_test_confs/lithium_sr1/lithium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.1-Lithium-SR1/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr1/lithium_RPC_sb_idle_scalability_mtcbench.json b/stress_test/stress_test_confs/lithium_sr1/lithium_RPC_sb_idle_scalability_mtcbench.json
index 9364518e..ec0c05c0 100644
--- a/stress_test/stress_test_confs/lithium_sr1/lithium_RPC_sb_idle_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/lithium_sr1/lithium_RPC_sb_idle_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.1-Lithium-SR1/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr1/lithium_nb_active_scalability_multinet.json b/stress_test/stress_test_confs/lithium_sr1/lithium_nb_active_scalability_multinet.json
index e660cba2..541dc048 100755
--- a/stress_test/stress_test_confs/lithium_sr1/lithium_nb_active_scalability_multinet.json
+++ b/stress_test/stress_test_confs/lithium_sr1/lithium_nb_active_scalability_multinet.json
@@ -40,7 +40,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.1-Lithium-SR1/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL (Lithium)",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr1/lithium_sb_active_scalability_multinet_LinearTopo.json b/stress_test/stress_test_confs/lithium_sr1/lithium_sb_active_scalability_multinet_LinearTopo.json
index 6718f2b7..2c2b572c 100644
--- a/stress_test/stress_test_confs/lithium_sr1/lithium_sb_active_scalability_multinet_LinearTopo.json
+++ b/stress_test/stress_test_confs/lithium_sr1/lithium_sb_active_scalability_multinet_LinearTopo.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.1-Lithium-SR1/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
@@ -70,8 +69,6 @@
 
 "java_opts":["-Xmx2G","-Xms2G","-XX:+UseG1GC","-XX:MaxPermSize=512M"],
 
-"test_repeats":2,
-
 "plots":[
     {
         "x_axis_key":"multinet_size",
diff --git a/stress_test/stress_test_confs/lithium_sr1/lithium_sb_idle_scalability_multinet_DisconnectedTopo.json b/stress_test/stress_test_confs/lithium_sr1/lithium_sb_idle_scalability_multinet_DisconnectedTopo.json
index c732f54d..be466a3d 100755
--- a/stress_test/stress_test_confs/lithium_sr1/lithium_sb_idle_scalability_multinet_DisconnectedTopo.json
+++ b/stress_test/stress_test_confs/lithium_sr1/lithium_sb_idle_scalability_multinet_DisconnectedTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.1-Lithium-SR1/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr1/lithium_sb_idle_scalability_multinet_LinearTopo.json b/stress_test/stress_test_confs/lithium_sr1/lithium_sb_idle_scalability_multinet_LinearTopo.json
index 7b3e350d..a023b520 100755
--- a/stress_test/stress_test_confs/lithium_sr1/lithium_sb_idle_scalability_multinet_LinearTopo.json
+++ b/stress_test/stress_test_confs/lithium_sr1/lithium_sb_idle_scalability_multinet_LinearTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.1-Lithium-SR1/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr1/lithium_sb_idle_stability_multinet.json b/stress_test/stress_test_confs/lithium_sr1/lithium_sb_idle_stability_multinet.json
index 7ac2aff7..6e7a682f 100644
--- a/stress_test/stress_test_confs/lithium_sr1/lithium_sb_idle_stability_multinet.json
+++ b/stress_test/stress_test_confs/lithium_sr1/lithium_sb_idle_stability_multinet.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.1-Lithium-SR1/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":5000,
diff --git a/stress_test/stress_test_confs/lithium_sr2/lithium_DS_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/lithium_sr2/lithium_DS_sb_active_scalability_mtcbench.json
index 06890536..7de1aa47 100644
--- a/stress_test/stress_test_confs/lithium_sr2/lithium_DS_sb_active_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/lithium_sr2/lithium_DS_sb_active_scalability_mtcbench.json
@@ -33,7 +33,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Lithium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr2/lithium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/stress_test/stress_test_confs/lithium_sr2/lithium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
index 449e8667..5c184503 100644
--- a/stress_test/stress_test_confs/lithium_sr2/lithium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
+++ b/stress_test/stress_test_confs/lithium_sr2/lithium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Lithium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr2/lithium_RPC_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/lithium_sr2/lithium_RPC_sb_active_scalability_mtcbench.json
index 14e6a073..ffb3b5a1 100644
--- a/stress_test/stress_test_confs/lithium_sr2/lithium_RPC_sb_active_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/lithium_sr2/lithium_RPC_sb_active_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.2-Lithium-SR2/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr2/lithium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/stress_test/stress_test_confs/lithium_sr2/lithium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
index 434bdab4..d7a076ec 100644
--- a/stress_test/stress_test_confs/lithium_sr2/lithium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
+++ b/stress_test/stress_test_confs/lithium_sr2/lithium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.2-Lithium-SR2/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr2/lithium_RPC_sb_idle_scalability_mtcbench.json b/stress_test/stress_test_confs/lithium_sr2/lithium_RPC_sb_idle_scalability_mtcbench.json
index 7b11bd82..1d1a9352 100644
--- a/stress_test/stress_test_confs/lithium_sr2/lithium_RPC_sb_idle_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/lithium_sr2/lithium_RPC_sb_idle_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.2-Lithium-SR2/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr2/lithium_nb_active_scalability_multinet.json b/stress_test/stress_test_confs/lithium_sr2/lithium_nb_active_scalability_multinet.json
index 62c8312d..c351f5cd 100755
--- a/stress_test/stress_test_confs/lithium_sr2/lithium_nb_active_scalability_multinet.json
+++ b/stress_test/stress_test_confs/lithium_sr2/lithium_nb_active_scalability_multinet.json
@@ -40,7 +40,6 @@
 
 "controller_logs_dir":"distribution-karaf-0.5.0-Lithium/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL (Lithium)",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr2/lithium_sb_active_scalability_multinet_LinearTopo.json b/stress_test/stress_test_confs/lithium_sr2/lithium_sb_active_scalability_multinet_LinearTopo.json
index 3219e965..6faccece 100644
--- a/stress_test/stress_test_confs/lithium_sr2/lithium_sb_active_scalability_multinet_LinearTopo.json
+++ b/stress_test/stress_test_confs/lithium_sr2/lithium_sb_active_scalability_multinet_LinearTopo.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.2-Lithium-SR2/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
@@ -70,8 +69,6 @@
 
 "java_opts":["-Xmx2G","-Xms2G","-XX:+UseG1GC","-XX:MaxPermSize=512M"],
 
-"test_repeats":2,
-
 "plots":[
     {
         "x_axis_key":"multinet_size",
diff --git a/stress_test/stress_test_confs/lithium_sr2/lithium_sb_idle_scalability_multinet_DisconnectedTopo.json b/stress_test/stress_test_confs/lithium_sr2/lithium_sb_idle_scalability_multinet_DisconnectedTopo.json
index ec9d49a9..a711ae08 100755
--- a/stress_test/stress_test_confs/lithium_sr2/lithium_sb_idle_scalability_multinet_DisconnectedTopo.json
+++ b/stress_test/stress_test_confs/lithium_sr2/lithium_sb_idle_scalability_multinet_DisconnectedTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.2-Lithium-SR2/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr2/lithium_sb_idle_scalability_multinet_LinearTopo.json b/stress_test/stress_test_confs/lithium_sr2/lithium_sb_idle_scalability_multinet_LinearTopo.json
index 484cebdc..ae239594 100755
--- a/stress_test/stress_test_confs/lithium_sr2/lithium_sb_idle_scalability_multinet_LinearTopo.json
+++ b/stress_test/stress_test_confs/lithium_sr2/lithium_sb_idle_scalability_multinet_LinearTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.2-Lithium-SR2/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr2/lithium_sb_idle_stability_multinet.json b/stress_test/stress_test_confs/lithium_sr2/lithium_sb_idle_stability_multinet.json
index 20a2e805..57674878 100644
--- a/stress_test/stress_test_confs/lithium_sr2/lithium_sb_idle_stability_multinet.json
+++ b/stress_test/stress_test_confs/lithium_sr2/lithium_sb_idle_stability_multinet.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.2-Lithium-SR2/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":5000,
diff --git a/stress_test/stress_test_confs/lithium_sr3/lithium_DS_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/lithium_sr3/lithium_DS_sb_active_scalability_mtcbench.json
index b89f06df..e95db493 100644
--- a/stress_test/stress_test_confs/lithium_sr3/lithium_DS_sb_active_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/lithium_sr3/lithium_DS_sb_active_scalability_mtcbench.json
@@ -33,7 +33,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.3-Lithium-SR3/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr3/lithium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/stress_test/stress_test_confs/lithium_sr3/lithium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
index f76cd8f7..fa965132 100644
--- a/stress_test/stress_test_confs/lithium_sr3/lithium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
+++ b/stress_test/stress_test_confs/lithium_sr3/lithium_DS_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.3-Lithium-SR3/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr3/lithium_RPC_sb_active_scalability_mtcbench.json b/stress_test/stress_test_confs/lithium_sr3/lithium_RPC_sb_active_scalability_mtcbench.json
index bfe62136..0660f3b5 100644
--- a/stress_test/stress_test_confs/lithium_sr3/lithium_RPC_sb_active_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/lithium_sr3/lithium_RPC_sb_active_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.3-Lithium-SR3/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr3/lithium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json b/stress_test/stress_test_confs/lithium_sr3/lithium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
index 831ec709..c4326267 100644
--- a/stress_test/stress_test_confs/lithium_sr3/lithium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
+++ b/stress_test/stress_test_confs/lithium_sr3/lithium_RPC_sb_active_stability_mtcbench_no_restart_500Switches_12Hours.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.3-Lithium-SR3/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr3/lithium_RPC_sb_idle_scalability_mtcbench.json b/stress_test/stress_test_confs/lithium_sr3/lithium_RPC_sb_idle_scalability_mtcbench.json
index 1f5871c6..fe79f780 100644
--- a/stress_test/stress_test_confs/lithium_sr3/lithium_RPC_sb_idle_scalability_mtcbench.json
+++ b/stress_test/stress_test_confs/lithium_sr3/lithium_RPC_sb_idle_scalability_mtcbench.json
@@ -32,7 +32,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.3-Lithium-SR3/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr3/lithium_nb_active_scalability_multinet.json b/stress_test/stress_test_confs/lithium_sr3/lithium_nb_active_scalability_multinet.json
index 3d782ab7..3aad9e57 100755
--- a/stress_test/stress_test_confs/lithium_sr3/lithium_nb_active_scalability_multinet.json
+++ b/stress_test/stress_test_confs/lithium_sr3/lithium_nb_active_scalability_multinet.json
@@ -41,7 +41,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.3-Lithium-SR3/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL (Lithium)",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr3/lithium_sb_active_scalability_multinet_LinearTopo.json b/stress_test/stress_test_confs/lithium_sr3/lithium_sb_active_scalability_multinet_LinearTopo.json
index d5aad242..a8124b9e 100644
--- a/stress_test/stress_test_confs/lithium_sr3/lithium_sb_active_scalability_multinet_LinearTopo.json
+++ b/stress_test/stress_test_confs/lithium_sr3/lithium_sb_active_scalability_multinet_LinearTopo.json
@@ -33,7 +33,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.3-Lithium-SR3/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
@@ -71,7 +70,7 @@
 
 "java_opts":["-Xmx2G","-Xms2G","-XX:+UseG1GC","-XX:MaxPermSize=512M"],
 
-"test_repeats":2,
+
 
 "plots":[
     {
diff --git a/stress_test/stress_test_confs/lithium_sr3/lithium_sb_idle_scalability_multinet_DisconnectedTopo.json b/stress_test/stress_test_confs/lithium_sr3/lithium_sb_idle_scalability_multinet_DisconnectedTopo.json
index 12a1ed9a..e03a3c3d 100755
--- a/stress_test/stress_test_confs/lithium_sr3/lithium_sb_idle_scalability_multinet_DisconnectedTopo.json
+++ b/stress_test/stress_test_confs/lithium_sr3/lithium_sb_idle_scalability_multinet_DisconnectedTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.3-Lithium-SR3/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr3/lithium_sb_idle_scalability_multinet_LinearTopo.json b/stress_test/stress_test_confs/lithium_sr3/lithium_sb_idle_scalability_multinet_LinearTopo.json
index b79b3825..e0df6959 100755
--- a/stress_test/stress_test_confs/lithium_sr3/lithium_sb_idle_scalability_multinet_LinearTopo.json
+++ b/stress_test/stress_test_confs/lithium_sr3/lithium_sb_idle_scalability_multinet_LinearTopo.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.3-Lithium-SR3/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":[5000],
diff --git a/stress_test/stress_test_confs/lithium_sr3/lithium_sb_idle_stability_multinet.json b/stress_test/stress_test_confs/lithium_sr3/lithium_sb_idle_stability_multinet.json
index ccaaefa7..bf6eafa9 100644
--- a/stress_test/stress_test_confs/lithium_sr3/lithium_sb_idle_stability_multinet.json
+++ b/stress_test/stress_test_confs/lithium_sr3/lithium_sb_idle_stability_multinet.json
@@ -31,7 +31,6 @@
 
 "controller_logs_dir":"./distribution-karaf-0.3.3-Lithium-SR3/data/log/",
 
-"controller_cleanup":false,
 "controller_name":"ODL",
 "controller_port":6653,
 "controller_statistics_period_ms":5000,
diff --git a/stress_test/test_run.py b/stress_test/test_run.py
index 4730fed3..e86e9996 100644
--- a/stress_test/test_run.py
+++ b/stress_test/test_run.py
@@ -364,7 +364,6 @@ def sb_active_scalability_multinet_run(self,
                     json_conf['multinet_topo_group_delay_ms'],
                     json_conf['controller_statistics_period_ms']):
                 self.mon.global_sample_id = global_sample_id
-                self.mon.test_repeats = json_conf['test_repeats']
                 self.ctrl.check_status()
                 self.ctrl.start()
                 self.of.start()
diff --git a/stress_test/test_type.py b/stress_test/test_type.py
index 70a1ea9a..1600b569 100755
--- a/stress_test/test_type.py
+++ b/stress_test/test_type.py
@@ -60,6 +60,7 @@ def set_test_log_level(self, args):
         :type args: ArgumentParser object
         """
         logging_format = '[%(asctime)s %(levelname)7s ] %(message)s'
+
         if args.logging_level == 'INFO':
             logging.basicConfig(level=logging.INFO, stream=sys.stdout,
                                 format=logging_format)