diff --git a/TestON/tests/CHO/CHOtest/CHOtest.py b/TestON/tests/CHO/CHOtest/CHOtest.py
index 6fc4882..60bbfb1 100644
--- a/TestON/tests/CHO/CHOtest/CHOtest.py
+++ b/TestON/tests/CHO/CHOtest/CHOtest.py
@@ -16,7 +16,6 @@
         Startup sequence:
         apply cell <name>
         git pull
-        mvn clean install
         onos-package
         onos-verify-cell
         onos-uninstall
@@ -96,16 +95,6 @@
                                  onpass="Test step PASS",
                                  onfail="Test step FAIL" )
 
-        main.step( "mvn clean & install" )
-        if git_pull == 'on':
-            mvn_result = main.ONOSbench.cleanInstall()
-            utilities.assert_equals( expect=main.TRUE, actual=mvn_result,
-                                     onpass="Test step PASS",
-                                     onfail="Test step FAIL" )
-        else:
-            mvn_result = main.TRUE
-            main.log.info( "Skipped mvn clean install as git pull is disabled in params file" )
-
         main.ONOSbench.getVersion( report=True )
 
         main.step( "Create ONOS package" )
diff --git a/TestON/tests/CHOTestMonkey/CHOTestMonkey.py b/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
index 7113508..5ad6a87 100644
--- a/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
+++ b/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
@@ -20,7 +20,6 @@
         Startup sequence:
         apply cell <name>
         git pull
-        mvn clean install
         onos-package
         onos-verify-cell
         onos-uninstall
@@ -105,16 +104,6 @@
                                  onpass="Test step PASS",
                                  onfail="Test step FAIL" )
 
-        main.step( "mvn clean & install" )
-        if gitPull == 'on':
-            mvnResult = main.ONOSbench.cleanInstall()
-        else:
-            mvnResult = main.TRUE
-            main.log.info( "Skipped mvn clean install as it is disabled in params file" )
-        utilities.assert_equals( expect=main.TRUE,
-                                 actual=mvnResult,
-                                 onpass="Test step PASS",
-                                 onfail="Test step FAIL" )
         main.ONOSbench.getVersion( report=True )
 
         main.step( "Create ONOS package" )
diff --git a/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.py b/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.py
index 8d41458..e4a4567 100644
--- a/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.py
+++ b/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.py
@@ -29,7 +29,6 @@
         NOTE: temporary - onos-remove-raft-logs
         onos-uninstall
         git pull
-        mvn clean install
         onos-package
         onos-install -f
         onos-wait-for-start
@@ -91,7 +90,6 @@
             killed = main.ONOSbench.onosKill( node.ip_address )
             killResults = killResults and killed
 
-        cleanInstallResult = main.TRUE
         gitPullResult = main.FALSE
         main.step( "Git checkout and pull" + gitBranch )
         if PULLCODE:
@@ -102,19 +100,7 @@
                                       onpass="Git pull successful",
                                       onfail="Git pull failed" )
 
-        #main.ONOSbench.getVersion( report=True )
-
-        main.step( "Using mvn clean install" )
-        cleanInstallResult = main.TRUE
-        if PULLCODE and gitPullResult == main.TRUE:
-            cleanInstallResult = main.ONOSbench.cleanInstall()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn" +
-                           "clean install" )
-        utilities.assert_equals( expect=main.TRUE,
-                                 actual=cleanInstallResult,
-                                 onpass="MCI successful",
-                                 onfail="MCI failed" )
+        main.ONOSbench.getVersion( report=True )
 
         main.step( "Creating ONOS package" )
         packageResult = main.ONOSbench.buckBuild()
diff --git a/TestON/tests/FUNC/FUNCflow/FUNCflow.py b/TestON/tests/FUNC/FUNCflow/FUNCflow.py
index 3751289..31b427c 100644
--- a/TestON/tests/FUNC/FUNCflow/FUNCflow.py
+++ b/TestON/tests/FUNC/FUNCflow/FUNCflow.py
@@ -82,17 +82,7 @@
                                  onpass="Successfully construct " + "test variables ",
                                  onfail="Failed to construct test variables" )
 
-        if gitPull == 'True':
-            main.step( "Building ONOS in " + gitBranch + " branch" )
-            onosBuildResult = main.startUp.onosBuild( main, gitBranch )
-            stepResult = onosBuildResult
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully compiled " + "latest ONOS",
-                                     onfail="Failed to compile " + "latest ONOS" )
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
+
 
     def CASE2( self, main ):
         """
diff --git a/TestON/tests/FUNC/FUNCflow/dependencies/startUp.py b/TestON/tests/FUNC/FUNCflow/dependencies/startUp.py
index 8122586..a9becf9 100644
--- a/TestON/tests/FUNC/FUNCflow/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCflow/dependencies/startUp.py
@@ -27,7 +27,7 @@
     else:
         main.log.info( "Successfully pulled " + gitBranch + " branch" )
 
-    # Maven clean install
-    buildResult = main.ONOSbench.cleanInstall()
+    # buck build
+    buildResult = main.ONOSbench.buckBuild()
 
     return buildResult
diff --git a/TestON/tests/FUNC/FUNCgroup/FUNCgroup.py b/TestON/tests/FUNC/FUNCgroup/FUNCgroup.py
index 3a59d3d..29b2d2a 100644
--- a/TestON/tests/FUNC/FUNCgroup/FUNCgroup.py
+++ b/TestON/tests/FUNC/FUNCgroup/FUNCgroup.py
@@ -101,18 +101,6 @@
                                  onpass="Successfully construct " + "test variables ",
                                  onfail="Failed to construct test variables" )
 
-        if gitPull == 'True':
-            main.step( "Building ONOS in " + gitBranch + " branch" )
-            onosBuildResult = main.startUp.onosBuild( main, gitBranch )
-            stepResult = onosBuildResult
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully compiled " + "latest ONOS",
-                                     onfail="Failed to compile " + "latest ONOS" )
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
-
     def CASE2( self, main ):
         """
         - Set up cell
diff --git a/TestON/tests/FUNC/FUNCgroup/dependencies/startUp.py b/TestON/tests/FUNC/FUNCgroup/dependencies/startUp.py
index 8122586..a9becf9 100644
--- a/TestON/tests/FUNC/FUNCgroup/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCgroup/dependencies/startUp.py
@@ -27,7 +27,7 @@
     else:
         main.log.info( "Successfully pulled " + gitBranch + " branch" )
 
-    # Maven clean install
-    buildResult = main.ONOSbench.cleanInstall()
+    # buck build
+    buildResult = main.ONOSbench.buckBuild()
 
     return buildResult
diff --git a/TestON/tests/FUNC/FUNCintent/FUNCintent.py b/TestON/tests/FUNC/FUNCintent/FUNCintent.py
index ee42669..8adb52a 100644
--- a/TestON/tests/FUNC/FUNCintent/FUNCintent.py
+++ b/TestON/tests/FUNC/FUNCintent/FUNCintent.py
@@ -109,19 +109,6 @@
                                         "test variables ",
                                  onfail="Failed to construct test variables" )
 
-        if gitPull == 'True':
-            main.step( "Building ONOS in " + gitBranch + " branch" )
-            onosBuildResult = main.startUp.onosBuild( main, gitBranch )
-            stepResult = onosBuildResult
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully compiled " +
-                                            "latest ONOS",
-                                     onfail="Failed to compile " +
-                                            "latest ONOS" )
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
         main.ONOSbench.getVersion( report=True )
 
     def CASE2( self, main ):
diff --git a/TestON/tests/FUNC/FUNCintent/dependencies/startUp.py b/TestON/tests/FUNC/FUNCintent/dependencies/startUp.py
index 8122586..ad92fb9 100644
--- a/TestON/tests/FUNC/FUNCintent/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCintent/dependencies/startUp.py
@@ -27,7 +27,7 @@
     else:
         main.log.info( "Successfully pulled " + gitBranch + " branch" )
 
-    # Maven clean install
-    buildResult = main.ONOSbench.cleanInstall()
+    # buck Build
+    buildResult = main.ONOSbench.buckBuild()
 
     return buildResult
diff --git a/TestON/tests/FUNC/FUNCintentRest/FUNCintentRest.py b/TestON/tests/FUNC/FUNCintentRest/FUNCintentRest.py
index f02314c..8ea8d0d 100644
--- a/TestON/tests/FUNC/FUNCintentRest/FUNCintentRest.py
+++ b/TestON/tests/FUNC/FUNCintentRest/FUNCintentRest.py
@@ -126,19 +126,6 @@
                                         "test variables ",
                                  onfail="Failed to construct test variables" )
 
-        if gitPull == 'True':
-            main.step( "Building ONOS in " + gitBranch + " branch" )
-            onosBuildResult = main.startUp.onosBuild( main, gitBranch )
-            stepResult = onosBuildResult
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully compiled " +
-                                            "latest ONOS",
-                                     onfail="Failed to compile " +
-                                            "latest ONOS" )
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
         main.ONOSbench.getVersion( report=True )
 
     def CASE2( self, main ):
diff --git a/TestON/tests/FUNC/FUNCintentRest/dependencies/startUp.py b/TestON/tests/FUNC/FUNCintentRest/dependencies/startUp.py
index 8122586..ad92fb9 100644
--- a/TestON/tests/FUNC/FUNCintentRest/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCintentRest/dependencies/startUp.py
@@ -27,7 +27,7 @@
     else:
         main.log.info( "Successfully pulled " + gitBranch + " branch" )
 
-    # Maven clean install
-    buildResult = main.ONOSbench.cleanInstall()
+    # buck Build
+    buildResult = main.ONOSbench.buckBuild()
 
     return buildResult
diff --git a/TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.py b/TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.py
index 26489db..94f64ce 100644
--- a/TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.py
+++ b/TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.py
@@ -100,19 +100,6 @@
                                         "test variables ",
                                  onfail="Failed to construct test variables" )
 
-        if gitPull == 'True':
-            main.step( "Building ONOS in " + gitBranch + " branch" )
-            onosBuildResult = main.startUp.onosBuild( main, gitBranch )
-            stepResult = onosBuildResult
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully compiled " +
-                                            "latest ONOS",
-                                     onfail="Failed to compile " +
-                                            "latest ONOS" )
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
         main.ONOSbench.getVersion( report=True )
 
     def CASE2( self, main ):
diff --git a/TestON/tests/FUNC/FUNCipv6Intent/dependencies/startUp.py b/TestON/tests/FUNC/FUNCipv6Intent/dependencies/startUp.py
index 8122586..a9becf9 100644
--- a/TestON/tests/FUNC/FUNCipv6Intent/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCipv6Intent/dependencies/startUp.py
@@ -27,7 +27,7 @@
     else:
         main.log.info( "Successfully pulled " + gitBranch + " branch" )
 
-    # Maven clean install
-    buildResult = main.ONOSbench.cleanInstall()
+    # buck build
+    buildResult = main.ONOSbench.buckBuild()
 
     return buildResult
diff --git a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
index d0eec88..61d7e13 100644
--- a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
+++ b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
@@ -96,19 +96,6 @@
                                         "test variables ",
                                  onfail="Failed to construct test variables" )
 
-        if gitPull == 'True':
-            main.step( "Building ONOS in " + gitBranch + " branch" )
-            onosBuildResult = main.startUp.onosBuild( main, gitBranch )
-            stepResult = onosBuildResult
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully compiled " +
-                                            "latest ONOS",
-                                     onfail="Failed to compile " +
-                                            "latest ONOS" )
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
         main.ONOSbench.getVersion( report=True )
 
     def CASE2( self, main ):
diff --git a/TestON/tests/FUNC/FUNCnetCfg/dependencies/startUp.py b/TestON/tests/FUNC/FUNCnetCfg/dependencies/startUp.py
index 8455cd6..9ebeb60 100644
--- a/TestON/tests/FUNC/FUNCnetCfg/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCnetCfg/dependencies/startUp.py
@@ -25,7 +25,7 @@
     else:
         main.log.info( "Successfully pulled " + gitBranch + " branch" )
 
-    # Maven clean install
-    buildResult = main.ONOSbench.cleanInstall()
+    # buck build
+    buildResult = main.ONOSbench.buckBuild()
 
     return buildResult
diff --git a/TestON/tests/FUNC/FUNCnetconf/FUNCnetconf.py b/TestON/tests/FUNC/FUNCnetconf/FUNCnetconf.py
index b06741b..1b22c2f 100644
--- a/TestON/tests/FUNC/FUNCnetconf/FUNCnetconf.py
+++ b/TestON/tests/FUNC/FUNCnetconf/FUNCnetconf.py
@@ -112,19 +112,6 @@
                                         "test variables ",
                                  onfail="Failed to construct test variables" )
 
-        if gitPull == 'True':
-            main.step( "Building ONOS in " + gitBranch + " branch" )
-            onosBuildResult = main.startUp.onosBuild( main, gitBranch )
-            stepResult = onosBuildResult
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully compiled " +
-                                            "latest ONOS",
-                                     onfail="Failed to compile " +
-                                            "latest ONOS" )
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
         main.ONOSbench.getVersion( report=True )
 
     def CASE2( self, main ):
diff --git a/TestON/tests/FUNC/FUNCnetconf/dependencies/startUp.py b/TestON/tests/FUNC/FUNCnetconf/dependencies/startUp.py
index 8122586..a9becf9 100644
--- a/TestON/tests/FUNC/FUNCnetconf/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCnetconf/dependencies/startUp.py
@@ -27,7 +27,7 @@
     else:
         main.log.info( "Successfully pulled " + gitBranch + " branch" )
 
-    # Maven clean install
-    buildResult = main.ONOSbench.cleanInstall()
+    # buck build
+    buildResult = main.ONOSbench.buckBuild()
 
     return buildResult
diff --git a/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py b/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py
index 61da26b..1e68327 100644
--- a/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py
+++ b/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py
@@ -83,19 +83,6 @@
                                         "test variables ",
                                  onfail="Failed to construct test variables" )
 
-        if gitPull == 'True':
-            main.step( "Building ONOS in " + gitBranch + " branch" )
-            onosBuildResult = main.startUp.onosBuild( main, gitBranch )
-            stepResult = onosBuildResult
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully compiled " +
-                                            "latest ONOS",
-                                     onfail="Failed to compile " +
-                                            "latest ONOS" )
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
         main.ONOSbench.getVersion( report=True )
 
     def CASE2( self, main ):
diff --git a/TestON/tests/FUNC/FUNCovsdbtest/FUNCovsdbtest.py b/TestON/tests/FUNC/FUNCovsdbtest/FUNCovsdbtest.py
index 5073a8a..e40a0e8 100644
--- a/TestON/tests/FUNC/FUNCovsdbtest/FUNCovsdbtest.py
+++ b/TestON/tests/FUNC/FUNCovsdbtest/FUNCovsdbtest.py
@@ -50,17 +50,6 @@
         main.startUpSleep = int( main.params[ 'SLEEP' ][ 'startup' ] )
         cellAppString = main.params[ 'ENV' ][ 'cellApps' ]
 
-        if gitPull == 'True':
-            main.step( "Building ONOS in " + gitBranch + "branch" )
-            onosBuildResult = main.startUp.onosBuild( main, gitBranch )
-            stepResult = onosBuildResult
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully compiled latest ONOS",
-                                     onfail="Failed to compile latest ONOS" )
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
         main.ONOSbench.getVersion( report=True )
 
         main.log.info( "Safety check, killing all ONOS processes" +
diff --git a/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py b/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py
index c8a5c55..499aa77 100644
--- a/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py
+++ b/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py
@@ -104,7 +104,6 @@
             killed = main.ONOSbench.onosKill( node.ip_address )
             killResults = killResults and killed
 
-        cleanInstallResult = main.TRUE
         gitPullResult = main.TRUE
         main.log.info( "Git checkout and pull " + gitBranch )
         if PULLCODE:
@@ -115,18 +114,6 @@
                                       onpass="Git pull successful",
                                       onfail="Git pull failed" )
         main.ONOSbench.getVersion( report=True )
-        main.step( "Using mvn clean install" )
-        cleanInstallResult = main.TRUE
-        if PULLCODE and gitPullResult == main.TRUE:
-            cleanInstallResult = main.ONOSbench.cleanInstall()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
-
-        utilities.assert_equals( expect=main.TRUE,
-                                 actual=cleanInstallResult,
-                                 onpass="MCI successful",
-                                 onfail="MCI failed" )
 
         main.step( "Creating ONOS package" )
         packageResult = main.ONOSbench.buckBuild()
diff --git a/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
index 8931dad..83115b9 100644
--- a/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
@@ -133,7 +133,6 @@
             killed = main.ONOSbench.onosKill( node.ip_address )
             killResults = killResults and killed
 
-        cleanInstallResult = main.TRUE
         gitPullResult = main.TRUE
 
         main.step( "Starting Mininet" )
@@ -160,17 +159,6 @@
                                       onfail="Git pull failed" )
         main.ONOSbench.getVersion( report=True )
 
-        main.step( "Using mvn clean install" )
-        cleanInstallResult = main.TRUE
-        if PULLCODE and gitPullResult == main.TRUE:
-            cleanInstallResult = main.ONOSbench.cleanInstall()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
-        utilities.assert_equals( expect=main.TRUE,
-                                 actual=cleanInstallResult,
-                                 onpass="MCI successful",
-                                 onfail="MCI failed" )
         # GRAPHS
         # NOTE: important params here:
         #       job = name of Jenkins job
diff --git a/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py b/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
index 297171a..6a8283f 100644
--- a/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
+++ b/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
@@ -135,7 +135,6 @@
             killed = main.ONOSbench.onosKill( node.ip_address )
             killResults = killResults and killed
 
-        cleanInstallResult = main.TRUE
         gitPullResult = main.TRUE
 
         main.step( "Starting Mininet" )
@@ -162,17 +161,6 @@
                                       onfail="Git pull failed" )
         main.ONOSbench.getVersion( report=True )
 
-        main.step( "Using mvn clean install" )
-        cleanInstallResult = main.TRUE
-        if PULLCODE and gitPullResult == main.TRUE:
-            cleanInstallResult = main.ONOSbench.cleanInstall()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
-        utilities.assert_equals( expect=main.TRUE,
-                                 actual=cleanInstallResult,
-                                 onpass="MCI successful",
-                                 onfail="MCI failed" )
         # GRAPHS
         # NOTE: important params here:
         #       job = name of Jenkins job
diff --git a/TestON/tests/HA/HAkillNodes/HAkillNodes.py b/TestON/tests/HA/HAkillNodes/HAkillNodes.py
index df97bd6..31bab52 100644
--- a/TestON/tests/HA/HAkillNodes/HAkillNodes.py
+++ b/TestON/tests/HA/HAkillNodes/HAkillNodes.py
@@ -135,7 +135,6 @@
             killed = main.ONOSbench.onosKill( node.ip_address )
             killResults = killResults and killed
 
-        cleanInstallResult = main.TRUE
         gitPullResult = main.TRUE
 
         main.step( "Starting Mininet" )
@@ -162,18 +161,6 @@
                                       onfail="Git pull failed" )
         main.ONOSbench.getVersion( report=True )
 
-        main.step( "Using mvn clean install" )
-        cleanInstallResult = main.TRUE
-        if PULLCODE and gitPullResult == main.TRUE:
-            cleanInstallResult = main.ONOSbench.cleanInstall()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
-        utilities.assert_equals( expect=main.TRUE,
-                                 actual=cleanInstallResult,
-                                 onpass="MCI successful",
-                                 onfail="MCI failed" )
-
         main.step( "Make sure ONOS service doesn't automatically respawn" )
         handle = main.ONOSbench.handle
         handle.sendline( "sed -i -e 's/^respawn$/#respawn/g' tools/package/init/onos.conf" )
diff --git a/TestON/tests/HA/HAsanity/HAsanity.py b/TestON/tests/HA/HAsanity/HAsanity.py
index de2508e..52f0b49 100644
--- a/TestON/tests/HA/HAsanity/HAsanity.py
+++ b/TestON/tests/HA/HAsanity/HAsanity.py
@@ -134,7 +134,6 @@
             killed = main.ONOSbench.onosKill( node.ip_address )
             killResults = killResults and killed
 
-        cleanInstallResult = main.TRUE
         gitPullResult = main.TRUE
 
         main.step( "Starting Mininet" )
@@ -161,17 +160,6 @@
                                       onfail="Git pull failed" )
         main.ONOSbench.getVersion( report=True )
 
-        main.step( "Using mvn clean install" )
-        cleanInstallResult = main.TRUE
-        if PULLCODE and gitPullResult == main.TRUE:
-            cleanInstallResult = main.ONOSbench.cleanInstall()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
-        utilities.assert_equals( expect=main.TRUE,
-                                 actual=cleanInstallResult,
-                                 onpass="MCI successful",
-                                 onfail="MCI failed" )
         # GRAPHS
         # NOTE: important params here:
         #       job = name of Jenkins job
diff --git a/TestON/tests/HA/HAscaling/HAscaling.py b/TestON/tests/HA/HAscaling/HAscaling.py
index e1b0425..6e13d85 100644
--- a/TestON/tests/HA/HAscaling/HAscaling.py
+++ b/TestON/tests/HA/HAscaling/HAscaling.py
@@ -155,7 +155,6 @@
                                  onpass="New cluster metadata file generated",
                                  onfail="Failled to generate new metadata file" )
 
-        cleanInstallResult = main.TRUE
         gitPullResult = main.TRUE
 
         main.step( "Starting Mininet" )
@@ -182,17 +181,6 @@
                                       onfail="Git pull failed" )
         main.ONOSbench.getVersion( report=True )
 
-        main.step( "Using mvn clean install" )
-        cleanInstallResult = main.TRUE
-        if PULLCODE and gitPullResult == main.TRUE:
-            cleanInstallResult = main.ONOSbench.cleanInstall()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
-        utilities.assert_equals( expect=main.TRUE,
-                                 actual=cleanInstallResult,
-                                 onpass="MCI successful",
-                                 onfail="MCI failed" )
         # GRAPHS
         # NOTE: important params here:
         #       job = name of Jenkins job
diff --git a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
index e68ecda..42d88fe 100644
--- a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
+++ b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
@@ -110,7 +110,6 @@
             killed = main.ONOSbench.onosKill( node.ip_address )
             killResults = killResults and killed
 
-        cleanInstallResult = main.TRUE
         gitPullResult = main.TRUE
 
         main.step( "Starting Mininet" )
@@ -137,17 +136,6 @@
                                       onfail="Git pull failed" )
         main.ONOSbench.getVersion( report=True )
 
-        main.step( "Using mvn clean install" )
-        cleanInstallResult = main.TRUE
-        if PULLCODE and gitPullResult == main.TRUE:
-            cleanInstallResult = main.ONOSbench.cleanInstall()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
-        utilities.assert_equals( expect=main.TRUE,
-                                 actual=cleanInstallResult,
-                                 onpass="MCI successful",
-                                 onfail="MCI failed" )
         # GRAPHS
         # NOTE: important params here:
         #       job = name of Jenkins job
diff --git a/TestON/tests/HA/HAstopNodes/HAstopNodes.py b/TestON/tests/HA/HAstopNodes/HAstopNodes.py
index 49fc278..6b86378 100644
--- a/TestON/tests/HA/HAstopNodes/HAstopNodes.py
+++ b/TestON/tests/HA/HAstopNodes/HAstopNodes.py
@@ -135,7 +135,6 @@
             killed = main.ONOSbench.onosKill( node.ip_address )
             killResults = killResults and killed
 
-        cleanInstallResult = main.TRUE
         gitPullResult = main.TRUE
 
         main.step( "Starting Mininet" )
@@ -162,17 +161,6 @@
                                       onfail="Git pull failed" )
         main.ONOSbench.getVersion( report=True )
 
-        main.step( "Using mvn clean install" )
-        cleanInstallResult = main.TRUE
-        if PULLCODE and gitPullResult == main.TRUE:
-            cleanInstallResult = main.ONOSbench.cleanInstall()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
-        utilities.assert_equals( expect=main.TRUE,
-                                 actual=cleanInstallResult,
-                                 onpass="MCI successful",
-                                 onfail="MCI failed" )
         # GRAPHS
         # NOTE: important params here:
         #       job = name of Jenkins job
diff --git a/TestON/tests/HA/HAswapNodes/HAswapNodes.py b/TestON/tests/HA/HAswapNodes/HAswapNodes.py
index fe4f557..0811287 100644
--- a/TestON/tests/HA/HAswapNodes/HAswapNodes.py
+++ b/TestON/tests/HA/HAswapNodes/HAswapNodes.py
@@ -149,7 +149,6 @@
                                  onpass="New cluster metadata file generated",
                                  onfail="Failled to generate new metadata file" )
 
-        cleanInstallResult = main.TRUE
         gitPullResult = main.TRUE
 
         main.step( "Starting Mininet" )
@@ -176,17 +175,6 @@
                                       onfail="Git pull failed" )
         main.ONOSbench.getVersion( report=True )
 
-        main.step( "Using mvn clean install" )
-        cleanInstallResult = main.TRUE
-        if PULLCODE and gitPullResult == main.TRUE:
-            cleanInstallResult = main.ONOSbench.cleanInstall()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
-        utilities.assert_equals( expect=main.TRUE,
-                                 actual=cleanInstallResult,
-                                 onpass="MCI successful",
-                                 onfail="MCI failed" )
         # GRAPHS
         # NOTE: important params here:
         #       job = name of Jenkins job
diff --git a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
index 5ffb455..70bad52 100644
--- a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
+++ b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
@@ -66,19 +66,6 @@
                                         "test variables ",
                                  onfail="Failed to construct test variables" )
 
-        if gitPull == 'True':
-            main.step( "Building ONOS in " + gitBranch + " branch" )
-            onosBuildResult = main.startUp.onosBuild( main, gitBranch )
-            stepResult = onosBuildResult
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully compiled " +
-                                            "latest ONOS",
-                                     onfail="Failed to compile " +
-                                            "latest ONOS" )
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
 
     def CASE2( self, main ):
         """
diff --git a/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py b/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py
index ebd7718..a0e3e7b 100644
--- a/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py
+++ b/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py
@@ -37,16 +37,8 @@
                                      onfail="Failed to pull onos. Exiting test ..." )
             if not stepResult: main.exit()
 
-            main.step( "Building ONOS branch: " + gitBranch )
-            stepResult = main.ONOSbench.cleanInstall( skipTest = True )
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully build onos.",
-                                     onfail="Failed to build onos. Exiting test..." )
-            if not stepResult: main.exit()
-
         else:
-            main.log.warn( "Skipped pulling onos and Skipped building ONOS" )
+            main.log.warn( "Skipped pulling onos" )
 
 
     def CASE1( self, main ):
diff --git a/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py b/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py
index 3673622..ba9a3cc 100644
--- a/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py
+++ b/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py
@@ -37,14 +37,6 @@
                                      onfail="Failed to pull onos. Exiting test ..." )
             if not stepResult: main.exit()
 
-            main.step( "Building ONOS branch: " + gitBranch )
-            stepResult = main.ONOSbench.cleanInstall( skipTest = True )
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully build onos.",
-                                     onfail="Failed to build onos. Exiting test..." )
-            if not stepResult: main.exit()
-
         else:
             main.log.warn( "Skipped pulling onos and Skipped building ONOS" )
 
diff --git a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.params b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.params
index fb23e90..0b51d1a 100644
--- a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.params
+++ b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.params
@@ -11,7 +11,6 @@
     </ENV>
 
     <TEST>
-        <skipCleanInstall>yes</skipCleanInstall>
         <cbenchCMD>cbench -c localhost -p 6653 -m 1000 -l 70 -s 16 -M 100000 -w 10 -D 5000 -</cbenchCMD>
         <mode>t</mode>                     #t throughput
     </TEST>
diff --git a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
index ddadce2..5c40989 100644
--- a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
+++ b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
@@ -35,7 +35,6 @@
         CBENCHuser = main.params[ 'CBENCH'][ 'user' ]
         MN1Ip = os.environ[ main.params[ 'MN' ][ 'ip1' ] ]
         maxNodes = int(main.params[ 'availableNodes' ])
-        skipMvn = main.params[ 'TEST' ][ 'skipCleanInstall' ]
         cellName = main.params[ 'ENV' ][ 'cellName' ]
         cellApps = main.params[ 'ENV' ][ 'cellApps' ]
 
@@ -56,10 +55,6 @@
                 ipString = os.environ[main.params['CTRL']['ip1']]
                 ONOSIp.append(ipString)
 
-            #mvn clean install, for debugging set param 'skipCleanInstall' to yes to speed up test
-            if skipMvn != "yes":
-                mvnResult = main.ONOSbench.cleanInstall()
-
             #git
             main.step( "Git checkout and pull " + checkoutBranch )
             if gitPull == 'on':
diff --git a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params
index fe10703..3ce83c0 100644
--- a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params
+++ b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params
@@ -14,7 +14,6 @@
 
     <TEST>
         <enableFlowRuleStoreBackup>true</enableFlowRuleStoreBackup>
-        <skipCleanInstall>yes</skipCleanInstall>
         <warmUp>5</warmUp>                              #number of runs to warm up the system
         <sampleSize>20</sampleSize>                     #number of runs to take data from
         <neighbors>0,a</neighbors>                      #list of number of neighbors, a = all
diff --git a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
index 523a285..11054c9 100644
--- a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
+++ b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
@@ -31,7 +31,6 @@
         BENCHUser = main.params[ 'BENCH' ][ 'user' ]
         BENCHIp = main.params[ 'BENCH' ][ 'ip1' ]
         main.maxNodes = int(main.params[ 'max' ])
-        skipMvn = main.params[ 'TEST' ][ 'skipCleanInstall' ]
         cellName = main.params[ 'ENV' ][ 'cellName' ]
 
         main.log.info("==========DEBUG VERSION 3===========")
@@ -57,10 +56,6 @@
             ONOSIp = [0]
             ONOSIp.extend(main.ONOSbench.getOnosIps())
 
-            #mvn clean install, for debugging set param 'skipCleanInstall' to yes to speed up test
-            if skipMvn != "yes":
-                mvnResult = main.ONOSbench.cleanInstall()
-
             #git
             main.step( "Git checkout and pull " + checkoutBranch )
             if gitPull == 'on':
diff --git a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
index c221887..bfbe95d 100644
--- a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
+++ b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
@@ -90,14 +90,6 @@
         main.commit = main.ONOSbench.getVersion(report=True)
         main.commit = main.commit.split(" ")[1]
 
-        if gitPull == 'True':
-            if not main.startUp.onosBuild( main, gitBranch ):
-                main.log.error( "Failed to build ONOS" )
-                main.cleanup()
-                main.exit()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
         with open(main.dbFileName, "a") as dbFile:
             temp = "'" + main.commit + "',"
             temp += "'" + nic + "',"
diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
index 2fc760a..7952499 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
@@ -60,7 +60,6 @@
     <TEST>
         <loadFrom>1,1,1,1,1,1,1</loadFrom>                                     #generate load on server, 1 = generator on
         <numSwitches>10,10,10,10,10,10,10</numSwitches>
-        <skipCleanInstall>yes</skipCleanInstall>
         <duration>400</duration>
         <log_interval>20</log_interval>
         <numKeys>40000</numKeys>
diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
index 36fa781..91ca4ae 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
@@ -46,16 +46,8 @@
                                     onfail="Failed to pull onos. Exiting test ...")
             if not stepResult: main.exit()
 
-            main.step( "Building ONOS branch: " + gitBranch )
-            stepResult = main.ONOSbench.cleanInstall( skipTest=True )
-            utilities.assert_equals(expect=main.TRUE,
-                                    actual=stepResult,
-                                    onpass="Successfully build onos.",
-                                    onfail="Failed to build onos. Exiting test...")
-            if not stepResult: main.exit()
-
         else:
-            main.log.warn( "Skipped pulling onos and Skipped building ONOS" )
+            main.log.warn( "Skipped pulling onos" )
 
         main.cellName = main.params['ENV']['cellName']
         main.Apps = main.params['ENV']['cellApps']
diff --git a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.params b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.params
index 8843c2f..308e0d0 100644
--- a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.params
+++ b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.params
@@ -11,7 +11,6 @@
     </ENV>
 
     <TEST>
-        <skipCleanInstall>yes</skipCleanInstall>
         <warmUp>5</warmUp>
         <sampleSize>20</sampleSize>
         <intents>1,100,1000</intents>                       #list format, will be split on ','
diff --git a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
index 2c990c3..622c72a 100644
--- a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
+++ b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
@@ -44,13 +44,6 @@
                                     onfail="Failed to pull onos. Exiting test ...")
             if not stepResult: main.exit()
 
-            main.step("Building ONOS branch: " + gitBranch)
-            stepResult = main.ONOSbench.cleanInstall(skipTest=True)
-            utilities.assert_equals(expect=main.TRUE,
-                                    actual=stepResult,
-                                    onpass="Successfully build onos.",
-                                    onfail="Failed to build onos. Exiting test...")
-            if not stepResult: main.exit()
 
         else:
             main.log.warn("Skipped pulling onos and Skipped building ONOS")
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
index 64e0ab5..fd3553c 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
@@ -21,7 +21,6 @@
     </SEARCHTERM>
 
     <TEST>
-        <skipCleanInstall>yes</skipCleanInstall>
         <warmUp>5</warmUp>
         <sampleSize>20</sampleSize>
         <intents>1,100,1000</intents>                       #list format, will be split on ','
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
index 6a7c259..1d6f009 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
@@ -54,15 +54,6 @@
                                     onfail="Failed to pull onos. Exiting test ...")
             if not stepResult: main.exit()
 
-            main.step("Building ONOS branch: " + gitBranch)
-            stepResult = main.ONOSbench.cleanInstall(skipTest=True)
-            utilities.assert_equals(expect=main.TRUE,
-                                    actual=stepResult,
-                                    onpass="Successfully build onos.",
-                                    onfail="Failed to build onos. Exiting test...")
-            if not stepResult:
-                main.exit()
-
         else:
             main.log.warn("Skipped pulling onos and Skipped building ONOS")
         main.onosIp = main.ONOSbench.getOnosIps()
@@ -71,7 +62,6 @@
         main.BENCHIp = main.params['BENCH']['ip1']
         main.MN1Ip = main.params['MN']['ip1']
         main.maxNodes = int(main.params['max'])
-        main.skipMvn = main.params['TEST']['skipCleanInstall']
         main.cellName = main.params['ENV']['cellName']
         main.scale = (main.params['SCALE']).split(",")
         main.timeout = int(main.params['SLEEP']['timeout'])
diff --git a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
index 3236ef8..23f281b 100644
--- a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
+++ b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
@@ -44,13 +44,6 @@
                                     onfail="Failed to pull onos. Exiting test ...")
             if not stepResult: main.exit()
 
-            main.step( "Building ONOS branch: " + gitBranch )
-            stepResult = main.ONOSbench.cleanInstall( skipTest=True )
-            utilities.assert_equals(expect=main.TRUE,
-                                    actual=stepResult,
-                                    onpass="Successfully build onos.",
-                                    onfail="Failed to build onos. Exiting test...")
-            if not stepResult: main.exit()
 
         else:
             main.log.warn( "Skipped pulling onos and Skipped building ONOS" )
diff --git a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
index 24ccb4b..5fd051c 100644
--- a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
+++ b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
@@ -119,20 +119,6 @@
                                         "test variables ",
                                  onfail="Failed to construct test variables" )
 
-        if gitPull == 'True':
-            main.step( "Building ONOS in " + gitBranch + " branch" )
-            onosBuildResult = main.startUp.onosBuild( main, gitBranch )
-            stepResult = onosBuildResult
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=stepResult,
-                                     onpass="Successfully compiled " +
-                                            "latest ONOS",
-                                     onfail="Failed to compile " +
-                                            "latest ONOS" )
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
-
 
     def CASE2( self, main):
         """
diff --git a/TestON/tests/SCPF/SCPFscaleTopo/dependencies/startUp.py b/TestON/tests/SCPF/SCPFscaleTopo/dependencies/startUp.py
index bf2a2b6..501cbb3 100644
--- a/TestON/tests/SCPF/SCPFscaleTopo/dependencies/startUp.py
+++ b/TestON/tests/SCPF/SCPFscaleTopo/dependencies/startUp.py
@@ -28,8 +28,8 @@
     else:
         main.log.info( "Successfully pulled " + gitBranch + " branch" )
 
-    # Maven clean install
-    buildResult = main.ONOSbench.cleanInstall()
+    # buck build
+    buildResult = main.ONOSbench.buckBuild()
 
     return buildResult
 
diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
index 9032e1f..3d46cc8 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
@@ -115,14 +115,6 @@
         commit = main.ONOSbench.getVersion(report=True)
         commit = commit.split(" ")[1]
 
-        if gitPull == 'True':
-            if not main.startUp.onosBuild( main, gitBranch ):
-                main.log.error( "Failed to build ONOS" )
-                main.cleanup()
-                main.exit()
-        else:
-            main.log.warn( "Did not pull new code so skipping mvn " +
-                           "clean install" )
         with open(main.dbFileName, "a") as dbFile:
             temp = "'" + commit + "',"
             temp += "'" + nic + "',"
diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/dependencies/startUp.py b/TestON/tests/SCPF/SCPFscalingMaxIntents/dependencies/startUp.py
index bf2a2b6..501cbb3 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/dependencies/startUp.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/dependencies/startUp.py
@@ -28,8 +28,8 @@
     else:
         main.log.info( "Successfully pulled " + gitBranch + " branch" )
 
-    # Maven clean install
-    buildResult = main.ONOSbench.cleanInstall()
+    # buck build
+    buildResult = main.ONOSbench.buckBuild()
 
     return buildResult
 
diff --git a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
index c921a67..2620158 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
+++ b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
@@ -47,13 +47,6 @@
                                     onfail="Failed to pull onos. Exiting test ...")
             if not stepResult: main.exit()
 
-            main.step( "Building ONOS branch: " + gitBranch )
-            stepResult = main.ONOSbench.cleanInstall( skipTest=True )
-            utilities.assert_equals(expect=main.TRUE,
-                                    actual=stepResult,
-                                    onpass="Successfully build onos.",
-                                    onfail="Failed to build onos. Exiting test...")
-            if not stepResult: main.exit()
 
         else:
             main.log.warn( "Skipped pulling onos and Skipped building ONOS" )
diff --git a/TestON/tests/USECASE/SDNIPfunction/SDNIPfunction.py b/TestON/tests/USECASE/SDNIPfunction/SDNIPfunction.py
index 1c19c30..b3d34de 100644
--- a/TestON/tests/USECASE/SDNIPfunction/SDNIPfunction.py
+++ b/TestON/tests/USECASE/SDNIPfunction/SDNIPfunction.py
@@ -34,19 +34,11 @@
         main.log.report( "Uninstalling ONOS" )
         main.ONOSbench.onosUninstall( ONOS1Ip )
 
-        # cleanInstallResult = main.TRUE
         # gitPullResult = main.TRUE
 
         main.step( "Git pull" )
         gitPullResult = main.ONOSbench.gitPull()
 
-        main.step( "Using mvn clean install" )
-        if gitPullResult == main.TRUE:
-            cleanInstallResult = main.ONOSbench.cleanInstall( mciTimeout = 1000 )
-        else:
-             main.log.warn( "Did not pull new code so skipping mvn " +
-                            "clean install" )
-             cleanInstallResult = main.TRUE
 
         main.ONOSbench.getVersion( report = True )
 
@@ -71,9 +63,8 @@
         cliResult = main.ONOScli.startOnosCli( ONOS1Ip,
                 commandlineTimeout = 100, onosStartTimeout = 600 )
 
-        case1Result = ( cleanInstallResult and packageResult and
-                        cellResult and verifyResult and
-                        onos1InstallResult and
+        case1Result = ( packageResult and cellResult and
+                        verifyResult and onos1InstallResult and
                         onos1Isup and secureSshResult and
                         cliResult )
 
diff --git a/TestON/tests/USECASE/SDNIPperf/SDNIPperf.py b/TestON/tests/USECASE/SDNIPperf/SDNIPperf.py
index 9d6ae4a..0134e42 100644
--- a/TestON/tests/USECASE/SDNIPperf/SDNIPperf.py
+++ b/TestON/tests/USECASE/SDNIPperf/SDNIPperf.py
@@ -32,21 +32,11 @@
         main.log.report( "Uninstalling ONOS" )
         main.ONOSbench.onosUninstall( ONOS1Ip )
 
-        cleanInstallResult = main.TRUE
-        gitPullResult = main.TRUE
-
         main.step( "Git pull" )
         gitPullResult = main.FALSE
         #Need to push some new code to ONOS before using the git pull
         #gitPullResult = main.ONOSbench.gitPull()
 
-        main.step( "Using mvn clean install" )
-        if gitPullResult == main.TRUE:
-            #cleanInstallResult = main.ONOSbench.cleanInstall()
-            cleanInstallResult = main.ONOSbench.cleanInstall( skipTest=True)
-        else:
-             main.log.warn( "Did not pull new code so skipping mvn " +
-                             "clean install" )
         main.ONOSbench.getVersion( report=True )
 
         main.step( "Creating ONOS package" )
@@ -70,9 +60,8 @@
         cliResult = main.ONOScli.startOnosCli( ONOS1Ip,
                 commandlineTimeout=100, onosStartTimeout=600)
 
-        case1Result = ( cleanInstallResult and packageResult and
-                        cellResult and verifyResult and
-                        onos1InstallResult and
+        case1Result = ( packageResult and cellResult and
+                        verifyResult and onos1InstallResult and
                         onos1Isup and secureSshResult and
                         cliResult )
 
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/startUp.py b/TestON/tests/USECASE/SegmentRouting/dependencies/startUp.py
index bf2a2b6..501cbb3 100755
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/startUp.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/startUp.py
@@ -28,8 +28,8 @@
     else:
         main.log.info( "Successfully pulled " + gitBranch + " branch" )
 
-    # Maven clean install
-    buildResult = main.ONOSbench.cleanInstall()
+    # buck build
+    buildResult = main.ONOSbench.buckBuild()
 
     return buildResult
 
diff --git a/TestON/tests/USECASE/USECASE_SdnipFunction/USECASE_SdnipFunction.py b/TestON/tests/USECASE/USECASE_SdnipFunction/USECASE_SdnipFunction.py
index 69e9aef..983ac75 100644
--- a/TestON/tests/USECASE/USECASE_SdnipFunction/USECASE_SdnipFunction.py
+++ b/TestON/tests/USECASE/USECASE_SdnipFunction/USECASE_SdnipFunction.py
@@ -126,18 +126,6 @@
                                  actual=gitPullResult2,
                                  onpass="Git pull ONOS succeeded",
                                  onfail="Git pull ONOS failed" )
-
-        main.step( "Using mvn clean install" )
-        if gitPullResult == main.TRUE:
-            mciResult = main.ONOSbench.cleanInstall( mciTimeout=1000 )
-            utilities.assert_equals( expect=main.TRUE,
-                                     actual=mciResult,
-                                     onpass="Maven clean install ONOS succeeded",
-                                     onfail="Maven clean install ONOS failed" )
-        else:
-             main.log.warn( "Did not pull new code so skipping mvn " +
-                            "clean install" )
-             mciResult = main.TRUE
         '''
 
         main.ONOSbench.getVersion( report=True )
diff --git a/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py b/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
index d5d913e..ae706b3 100644
--- a/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
+++ b/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
@@ -74,8 +74,6 @@
             killed = main.ONOSbench.onosKill( node.ip_address )
             killResults = killResults and killed
 
-        cleanInstallResult = main.TRUE
-
         main.step( "Starting Mininet" )
         # scp topo file to mininet
         # TODO: move to params?