6 files changed, 3 insertions, 33 deletions
diff --git a/src/installer/corehost/cli/fxr/command_line.cpp b/src/installer/corehost/cli/fxr/command_line.cpp
index 045f7700e74..e3563947c3c 100644
--- a/src/installer/corehost/cli/fxr/command_line.cpp
+++ b/src/installer/corehost/cli/fxr/command_line.cpp
@@ -9,7 +9,6 @@
 #include "sdk_info.h"
 #include <trace.h>
 #include <utils.h>
-#include "bundle/info.h"
 
 namespace
 {
@@ -145,7 +144,7 @@ namespace
         if (mode == host_mode_t::apphost)
         {
             app_candidate = host_info.app_path;
-            doesAppExist = bundle::info_t::is_single_file_bundle() || pal::realpath(&app_candidate);
+            doesAppExist = pal::realpath(&app_candidate);
         }
         else
         {
diff --git a/src/installer/corehost/cli/fxr/corehost_init.cpp b/src/installer/corehost/cli/fxr/corehost_init.cpp
index d8a5f249829..22a3921f8e9 100644
--- a/src/installer/corehost/cli/fxr/corehost_init.cpp
+++ b/src/installer/corehost/cli/fxr/corehost_init.cpp
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 #include "corehost_init.h"
-#include "bundle/info.h"
 
 void make_cstr_arr(const std::vector<pal::string_t>& arr, std::vector<const pal::char_t*>* out)
 {
@@ -133,8 +132,6 @@ const host_interface_t& corehost_init_t::get_host_init_data()
     hi.host_info_dotnet_root = m_host_info_dotnet_root.c_str();
     hi.host_info_app_path = m_host_info_app_path.c_str();
 
-    hi.single_file_bundle_header_offset = bundle::info_t::is_single_file_bundle() ? bundle::info_t::the_app->header_offset() : 0;
-
     return hi;
 }
 
diff --git a/src/installer/corehost/cli/fxr/corehost_init.h b/src/installer/corehost/cli/fxr/corehost_init.h
index 0d7f87ae92f..eedc2e70d22 100644
--- a/src/installer/corehost/cli/fxr/corehost_init.h
+++ b/src/installer/corehost/cli/fxr/corehost_init.h
@@ -8,7 +8,7 @@
 #include "host_interface.h"
 #include "host_startup_info.h"
 #include "fx_definition.h"
- 
+
 class corehost_init_t
 {
 private:
@@ -37,7 +37,6 @@ private:
     const pal::string_t m_host_info_host_path;
     const pal::string_t m_host_info_dotnet_root;
     const pal::string_t m_host_info_app_path;
-
 public:
     corehost_init_t(
         const pal::string_t& host_command,
diff --git a/src/installer/corehost/cli/fxr/fx_muxer.cpp b/src/installer/corehost/cli/fxr/fx_muxer.cpp
index 31c8c177978..00584e4a91e 100644
--- a/src/installer/corehost/cli/fxr/fx_muxer.cpp
+++ b/src/installer/corehost/cli/fxr/fx_muxer.cpp
@@ -27,7 +27,6 @@
 #include "sdk_info.h"
 #include "sdk_resolver.h"
 #include "roll_fwd_on_no_candidate_fx_option.h"
-#include "bundle/info.h"
 
 namespace
 {
@@ -263,7 +262,6 @@ namespace
         pal::string_t& runtime_config,
         const runtime_config_t::settings_t& override_settings)
     {
-        // Check for the runtimeconfig.json file specified at the command line
         if (!runtime_config.empty() && !pal::realpath(&runtime_config))
         {
             trace::error(_X("The specified runtimeconfig.json [%s] does not exist"), runtime_config.c_str());
@@ -295,11 +293,6 @@ namespace
 
     host_mode_t detect_operating_mode(const host_startup_info_t& host_info)
     {
-        if (bundle::info_t::is_single_file_bundle())
-        {
-            return host_mode_t::apphost;
-        }
-
         if (coreclr_exists_in_dir(host_info.dotnet_root))
         {
             // Detect between standalone apphost or legacy split mode (specifying --depsfile and --runtimeconfig)
@@ -364,7 +357,6 @@ namespace
     {
         pal::string_t runtime_config = command_line::get_option_value(opts, known_options::runtime_config, _X(""));
 
-        // This check is for --depsfile option, which must be an actual file.
         pal::string_t deps_file = command_line::get_option_value(opts, known_options::deps_file, _X(""));
         if (!deps_file.empty() && !pal::realpath(&deps_file))
         {
diff --git a/src/installer/corehost/cli/fxr/hostfxr.cpp b/src/installer/corehost/cli/fxr/hostfxr.cpp
index 1fdfa210489..c9a346b799b 100644
--- a/src/installer/corehost/cli/fxr/hostfxr.cpp
+++ b/src/installer/corehost/cli/fxr/hostfxr.cpp
@@ -14,7 +14,6 @@
 #include "sdk_resolver.h"
 #include "hostfxr.h"
 #include "host_context.h"
-#include "bundle/info.h"
 
 namespace
 {
@@ -25,23 +24,6 @@ namespace
     }
 }
 
-SHARED_API int HOSTFXR_CALLTYPE hostfxr_main_bundle_startupinfo(const int argc, const pal::char_t* argv[], const pal::char_t* host_path, const pal::char_t* dotnet_root, const pal::char_t* app_path, int64_t bundle_header_offset)
-{
-    trace_hostfxr_entry_point(_X("hostfxr_main_bundle_startupinfo"));
-
-    StatusCode bundleStatus = bundle::info_t::process_bundle(host_path, app_path, bundle_header_offset);
-    if (bundleStatus != StatusCode::Success)
-    {
-        trace::error(_X("A fatal error occured while processing application bundle"));
-        return bundleStatus;
-    }
-
-    host_startup_info_t startup_info(host_path, dotnet_root, app_path);
-
-    return fx_muxer_t::execute(pal::string_t(), argc, argv, startup_info, nullptr, 0, nullptr);
-}
-
-
 SHARED_API int HOSTFXR_CALLTYPE hostfxr_main_startupinfo(const int argc, const pal::char_t* argv[], const pal::char_t* host_path, const pal::char_t* dotnet_root, const pal::char_t* app_path)
 {
     trace_hostfxr_entry_point(_X("hostfxr_main_startupinfo"));
diff --git a/src/installer/corehost/cli/fxr/hostpolicy_resolver.cpp b/src/installer/corehost/cli/fxr/hostpolicy_resolver.cpp
index de3291fecc5..049d61a62a5 100644
--- a/src/installer/corehost/cli/fxr/hostpolicy_resolver.cpp
+++ b/src/installer/corehost/cli/fxr/hostpolicy_resolver.cpp
@@ -29,6 +29,7 @@ namespace
         trace::verbose(_X("--- Resolving %s version from deps json [%s]"), LIBHOSTPOLICY_NAME, deps_json.c_str());
 
         pal::string_t retval;
+
         json_parser_t json;
         if (!json.parse_file(deps_json))
         {