diff --git a/libopenfpga/libarchopenfpga/src/openfpga_arch.h b/libopenfpga/libarchopenfpga/src/openfpga_arch.h
index a3dd71a12..33d8f1b6c 100644
--- a/libopenfpga/libarchopenfpga/src/openfpga_arch.h
+++ b/libopenfpga/libarchopenfpga/src/openfpga_arch.h
@@ -29,9 +29,6 @@ struct Arch {
   /* Technology devices */
   TechnologyLibrary tech_lib;
 
-  /* Simulation settings */
-  SimulationSetting sim_setting;
-
   /* Configuration protocol settings */
   ConfigProtocol config_protocol;
 
diff --git a/libopenfpga/libarchopenfpga/src/read_xml_openfpga_arch.cpp b/libopenfpga/libarchopenfpga/src/read_xml_openfpga_arch.cpp
index 031946346..1d5f23e9e 100644
--- a/libopenfpga/libarchopenfpga/src/read_xml_openfpga_arch.cpp
+++ b/libopenfpga/libarchopenfpga/src/read_xml_openfpga_arch.cpp
@@ -100,12 +100,6 @@ openfpga::Arch read_xml_openfpga_arch(const char* arch_file_name) {
     /* Parse the pb_type annotation */
     openfpga_arch.pb_type_annotations = read_xml_pb_type_annotations(xml_openfpga_arch, loc_data);
 
-    /* Second node should be <openfpga_simulation_setting> */
-    auto xml_simulation_settings = get_single_child(doc, "openfpga_simulation_setting", loc_data); 
-
-    /* Parse simulation settings to data structure */
-    openfpga_arch.sim_setting = read_xml_simulation_setting(xml_simulation_settings, loc_data);
-
   } catch (pugiutil::XmlError& e) {
     archfpga_throw(arch_file_name, e.line(),
                    "%s", e.what());
diff --git a/libopenfpga/libarchopenfpga/src/write_xml_openfpga_arch.cpp b/libopenfpga/libarchopenfpga/src/write_xml_openfpga_arch.cpp
index 468924ad2..2c5134d4e 100644
--- a/libopenfpga/libarchopenfpga/src/write_xml_openfpga_arch.cpp
+++ b/libopenfpga/libarchopenfpga/src/write_xml_openfpga_arch.cpp
@@ -63,9 +63,6 @@ void write_xml_openfpga_arch(const char* fname,
 
   fp << "</openfpga_architecture>" << "\n";
 
-  /* Write the simulation */
-  write_xml_simulation_setting(fp, fname, openfpga_arch.sim_setting);
-
   /* Close the file stream */
   fp.close();
 }
diff --git a/openfpga/src/base/openfpga_link_arch.cpp b/openfpga/src/base/openfpga_link_arch.cpp
index c67619caa..af75ff6a2 100644
--- a/openfpga/src/base/openfpga_link_arch.cpp
+++ b/openfpga/src/base/openfpga_link_arch.cpp
@@ -150,7 +150,7 @@ int link_arch(OpenfpgaContext& openfpga_ctx,
   /* OVERWRITE the simulation setting in openfpga context from the arch
    * TODO: This will be removed when openfpga flow is updated  
    */
-  openfpga_ctx.mutable_simulation_setting() = openfpga_ctx.mutable_arch().sim_setting;
+  //openfpga_ctx.mutable_simulation_setting() = openfpga_ctx.mutable_arch().sim_setting;
   annotate_simulation_setting(g_vpr_ctx.atom(),
                               openfpga_ctx.net_activity(),
                               openfpga_ctx.mutable_simulation_setting());
diff --git a/openfpga/src/base/openfpga_setup_command.cpp b/openfpga/src/base/openfpga_setup_command.cpp
index e9d759b1f..bf2412a6f 100644
--- a/openfpga/src/base/openfpga_setup_command.cpp
+++ b/openfpga/src/base/openfpga_setup_command.cpp
@@ -366,8 +366,8 @@ void add_openfpga_setup_commands(openfpga::Shell<OpenfpgaContext>& shell) {
   std::vector<ShellCommandId> link_arch_dependent_cmds;
   link_arch_dependent_cmds.push_back(read_arch_cmd_id);
   /* TODO: This will be uncommented when openfpga flow script is updated
-   * link_arch_dependent_cmds.push_back(read_sim_setting_cmd_id);
    */
+  link_arch_dependent_cmds.push_back(read_sim_setting_cmd_id);
   link_arch_dependent_cmds.push_back(vpr_cmd_id);
   ShellCommandId link_arch_cmd_id = add_openfpga_link_arch_command(shell,
                                                                    openfpga_setup_cmd_class,