diff --git a/src/zenml/zen_stores/schemas/pipeline_run_schemas.py b/src/zenml/zen_stores/schemas/pipeline_run_schemas.py
index e4d66748fd..091017b6ef 100644
--- a/src/zenml/zen_stores/schemas/pipeline_run_schemas.py
+++ b/src/zenml/zen_stores/schemas/pipeline_run_schemas.py
@@ -297,8 +297,6 @@ def to_model(
             else {}
         )
 
-        run_metadata = self.fetch_metadata()
-
         if self.deployment is not None:
             deployment = self.deployment.to_model()
 
@@ -375,7 +373,7 @@ def to_model(
             }
             metadata = PipelineRunResponseMetadata(
                 workspace=self.workspace.to_model(),
-                run_metadata=run_metadata,
+                run_metadata=self.fetch_metadata(),
                 config=config,
                 steps=steps,
                 start_time=self.start_time,
diff --git a/src/zenml/zen_stores/schemas/step_run_schemas.py b/src/zenml/zen_stores/schemas/step_run_schemas.py
index d7f1374531..75736c6d54 100644
--- a/src/zenml/zen_stores/schemas/step_run_schemas.py
+++ b/src/zenml/zen_stores/schemas/step_run_schemas.py
@@ -228,8 +228,6 @@ def to_model(
             RuntimeError: If the step run schema does not have a deployment_id
                 or a step_configuration.
         """
-        run_metadata = self.fetch_metadata()
-
         input_artifacts = {
             artifact.name: StepRunInputResponse(
                 input_type=StepRunInputArtifactType(artifact.type),
@@ -316,7 +314,7 @@ def to_model(
                 pipeline_run_id=self.pipeline_run_id,
                 original_step_run_id=self.original_step_run_id,
                 parent_step_ids=[p.parent_id for p in self.parents],
-                run_metadata=run_metadata,
+                run_metadata=self.fetch_metadata(),
             )
 
         resources = None
diff --git a/tests/integration/functional/utils/__init__.py b/tests/integration/functional/utils/__init__.py
deleted file mode 100644
index cd90a82cfc..0000000000
--- a/tests/integration/functional/utils/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#  Copyright (c) ZenML GmbH 2024. All Rights Reserved.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at:
-#
-#       https://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-#  or implied. See the License for the specific language governing
-#  permissions and limitations under the License.