diff --git a/Makefile b/Makefile
index 56f1317..688a925 100755
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,14 @@
 $(shell grep go_package $(1) | sed -n 's/.*\/\(.*\)";/\1/p')
 endef
 
+# -----------------------------------------------------------------------
 # Function to extract the last path component from package line in .proto files
-#   protos/voltha_protos/common.proto => common
+#   % grep 'package' will match:
+#     o package <name> ;
+#     o option java_package='<dot-pkg-fqdn>
+# -----------------------------------------------------------------------
+# RETURN: protos/voltha_protos/common.proto => common
+# -----------------------------------------------------------------------
 define java_package_path
 $(shell grep package $(1) | sed -n 's/.*\/\(.*\)";/\1/p')
 endef
@@ -91,9 +97,6 @@
 # Python targets
 python-protos: $(PROTO_PYTHON_PB2)
 
-show-pb2:
-	@echo $(PROTO_PYTHON_PB2) | tr ' ' '\n'
-
 ## -----------------------------------------------------------------------
 ## -----------------------------------------------------------------------
 $(PROTO_PYTHON_DEST_DIR)/%_pb2.py: \
@@ -252,7 +255,7 @@
 java-protos-dirs += java_temp/src/main/java/org/opencord/voltha/adapter_service
 
 mkdir-args += -vp
-mkdir-args += --mode=0777
+# mkdir-args += --mode=0777
 
 java-protos: voltha.pb
 
diff --git a/VERSION b/VERSION
index 6ffbe8b..426c1c1 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.4.3
+5.4.4