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()