diff --git a/tools/package/branding/BUILD b/tools/package/branding/BUILD
index e4f8270..2b318a7 100644
--- a/tools/package/branding/BUILD
+++ b/tools/package/branding/BUILD
@@ -1,6 +1,5 @@
-
 java_library(
-     name = "onos-tools-package-branding",
-     resources = glob(["src/main/resources/**/*"]),
-     visibility = ["//visibility:public"],
- )
\ No newline at end of file
+    name = "onos-tools-package-branding",
+    resources = glob(["src/main/resources/**/*"]),
+    visibility = ["//visibility:public"],
+)
diff --git a/tools/package/features/BUILD b/tools/package/features/BUILD
index 5443842..b7ad28d 100644
--- a/tools/package/features/BUILD
+++ b/tools/package/features/BUILD
@@ -105,18 +105,17 @@
     required_features = ["onos-api"],
 )
 
-
 FEATURES = [
     "//tools/package/features:onos-thirdparty-base",
     "//tools/package/features:onos-thirdparty-web",
     "//tools/package/features:onos-api",
     "//tools/package/features:onos-core",
-#    "//tools/package/features:onos-incubator",
-#    "//tools/package/features:onos-rest",
-#    "//tools/package/features:onos-gui",
-#    "//tools/package/features:onos-gui2",
-#    "//tools/package/features:onos-cli",
-#    "//tools/package/features:onos-security",
+    #    "//tools/package/features:onos-incubator",
+    #    "//tools/package/features:onos-rest",
+    #    "//tools/package/features:onos-gui",
+    #    "//tools/package/features:onos-gui2",
+    #    "//tools/package/features:onos-cli",
+    #    "//tools/package/features:onos-security",
 ]
 
 osgi_feature_repo(