diff --git a/tfx/orchestration/portable/launcher.py b/tfx/orchestration/portable/launcher.py
index 49ef5bdc1f..e6de68315e 100644
--- a/tfx/orchestration/portable/launcher.py
+++ b/tfx/orchestration/portable/launcher.py
@@ -193,15 +193,9 @@ def __init__(
     self._driver_operators.update(custom_driver_operators or {})
 
     self._executor_operator = None
-    # redundant line for external usage.
-    executor_operator = None
     if executor_spec:
-      if executor_operator is None:
-        executor_operator = self._executor_operators[type(executor_spec)](
-            executor_spec=executor_spec, platform_config=platform_config
-        )
-      self._executor_operator = executor_operator
-
+      self._executor_operator = self._executor_operators[type(executor_spec)](
+          executor_spec, platform_config)
     self._output_resolver = outputs_utils.OutputsResolver(
         pipeline_node=self._pipeline_node,
         pipeline_info=self._pipeline_info,
diff --git a/tfx/utils/proto_utils.py b/tfx/utils/proto_utils.py
index de5abf4fd7..381b557274 100644
--- a/tfx/utils/proto_utils.py
+++ b/tfx/utils/proto_utils.py
@@ -95,9 +95,8 @@ def _create_proto_instance_from_name(
     message_name: str, pool: descriptor_pool.DescriptorPool) -> ProtoMessage:
   """Creates a protobuf message instance from a given message name."""
   message_descriptor = pool.FindMessageTypeByName(message_name)
-  factory = message_factory.MessageFactory(pool)
-  message_type = factory.GetPrototype(message_descriptor)
-  return message_type()
+  message_class = message_factory.GetMessageClass(message_descriptor)
+  return message_class()
 
 
 def get_pool_with_descriptors(