diff --git a/minimal-values.yaml b/minimal-values.yaml
index fd14728..41c05b2 100644
--- a/minimal-values.yaml
+++ b/minimal-values.yaml
@@ -28,19 +28,6 @@
 private_etcd_cluster: false
 private_kafka_cluster: false
 
-# OFAGENT IMPLEMENTATION
-# ----------------------
-# There are currently two implementations of OFAGENT: the original written in
-# Python and the reimplementation written in Go. The variable `use_ofagent_go`
-# can be used to optionally select the implementation. The Go version is the
-# version to be part of the official release and is the default. The Python
-# verison has been deprecated and is no longer being actively workes, but is
-# being left as an option for this release.
-#
-# Along with this change you will also may need to set the Docker image
-# information below (search for START_OFAGENT_GO).
-use_ofagent_go: true
-
 # OPENONU-ADAPTER IMPLEMENTATION
 # ------------------------------
 # There are currently two implementations of OPENONU-ADAPTER: the original
@@ -84,15 +71,9 @@
 #  bbsim:
 #    repository: voltha/bbsim
 #    tag: master
-# START_OFAGENT_GO - Comment the following block to use the Python
-# implementation of the ofagent
-#  ofagent_go:
+#  ofagent:
 #    repository: voltha/voltha-ofagent-go
 #    tag: master
-# END_OFAGENT_GO
-#  ofagent_py:
-#    repository: voltha/voltha-ofagent-py
-#    tag: 2.1.1
 #  rw_core:
 #    repository: voltha/voltha-rw-core
 #    tag: 2.1.1
diff --git a/voltha b/voltha
index e44e1df..ff3897c 100755
--- a/voltha
+++ b/voltha
@@ -87,7 +87,6 @@
 WITH_KAFKA=${WITH_KAFKA:-yes}
 WITH_ETCD=${WITH_ETCD:-yes}
 WITH_PPROF=${WITH_PPROF:-no}
-ONLY_ONE=${ONLY_ONE:-yes}
 SCHEDULE_ON_CONTROL_NODES=${SCHEDULE_ON_CONTROL_NODES:-no}
 CONFIG_SADIS=${CONFIG_SADIS:-no} # yes | no | file | bbsim | external | URL
 SADIS_CFG=${SADIS_CFG:-onos-files/onos-sadis-sample.json}
@@ -274,7 +273,6 @@
     HELM_USE_UPGRADE \
     UPDATE_HELM_REPOS \
     WAIT_ON_DOWN \
-    ONLY_ONE \
     VOLTHA_DOWN_ON_TIMEOUT \
     LEGACY_BBSIM_INDEX \
     SCHEDULE_ON_CONTROL_NODES \
@@ -1891,13 +1889,9 @@
 fi
 
 STIME="$(date +%s)"
-EXPECT=1
-if [ "$ONLY_ONE" == "yes" ]; then
-    EXPECT="$((EXPECT+1))"
-    INTERNAL_EXTRA_HELM_INSTALL_ARGS="--set therecanbeonlyone=true"
-else
-    EXPECT="$((EXPECT+2))"
-fi
+EXPECT=2
+# therecanbeonlyone set hardcoded to true for backward compatibility
+INTERNAL_EXTRA_HELM_INSTALL_ARGS="--set therecanbeonlyone=true"
 case $WITH_ETCD in
     no)
         ;;