diff --git a/tools/build/onos-buck b/tools/build/onos-buck
index 07ffd9c..7dab646 100755
--- a/tools/build/onos-buck
+++ b/tools/build/onos-buck
@@ -122,9 +122,9 @@
 fi
 
 # HACK: Clean-up frequent problem-causers from buck-out
-rm -fr \
-    $ONOS_ROOT/buck-out/bin/lib/.netty \
-    $ONOS_ROOT/buck-out/bin/lib/.KRYO
+#rm -fr \
+#    $ONOS_ROOT/buck-out/bin/lib/.netty \
+#    $ONOS_ROOT/buck-out/bin/lib/.KRYO
 
 # Finally, run the Buck command...
 $BUCK "$@"
diff --git a/tools/build/onos-package b/tools/build/onos-package
index 67c507b..9d3a747 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -4,4 +4,4 @@
 # -----------------------------------------------------------------------------
 
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
-cd $ONOS_ROOT && onos-buck build onos --show-output && onos-check-bits
+cd $ONOS_ROOT && onos-buck build onos --deep --show-output && onos-check-bits