diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py
index e8039f1f3d8..d90e8640403 100644
--- a/lib/galaxy/jobs/__init__.py
+++ b/lib/galaxy/jobs/__init__.py
@@ -33,7 +33,6 @@ from galaxy.exceptions import (
     ObjectInvalid,
     ObjectNotFound,
 )
-from galaxy.job_execution.datasets import TaskPathRewriter
 from galaxy.job_execution.output_collect import (
     collect_extra_files,
     collect_shrinked_content_from_path,
diff --git a/lib/galaxy/jobs/command_factory.py b/lib/galaxy/jobs/command_factory.py
index e32194577f2..f664fdd0d21 100644
--- a/lib/galaxy/jobs/command_factory.py
+++ b/lib/galaxy/jobs/command_factory.py
@@ -176,7 +176,7 @@ def __externalize_commands(job_wrapper, shell, commands_builder, remote_command_
 def __handle_remote_command_line_building(commands_builder, job_wrapper, for_pulsar=False):
     if getattr(job_wrapper, 'remote_command_line', False):
         sep = "" if for_pulsar else "&&"
-        command = 'PYTHONPATH="$GALAXY_LIB:$PYTHONPATH" python "$GALAXY_LIB"/galaxy/metadata/remote_tool_eval.py'
+        command = 'PYTHONPATH="$GALAXY_LIB:$PYTHONPATH" python "$GALAXY_LIB"/galaxy/tools/remote_tool_eval.py'
         if for_pulsar:
             # TODO: that's not how to do this, pulsar doesn't execute an externalized script by default.
             # This also breaks rewriting paths etc, so it doesn't really work if there are no shared paths
diff --git a/lib/galaxy/metadata/remote_tool_eval.py b/lib/galaxy/tools/remote_tool_eval.py
similarity index 100%
rename from lib/galaxy/metadata/remote_tool_eval.py
rename to lib/galaxy/tools/remote_tool_eval.py