diff --git a/generators/chipyard/src/main/scala/config/ChipConfigs.scala b/generators/chipyard/src/main/scala/config/ChipConfigs.scala
index 627babfa..c34492a4 100644
--- a/generators/chipyard/src/main/scala/config/ChipConfigs.scala
+++ b/generators/chipyard/src/main/scala/config/ChipConfigs.scala
@@ -7,8 +7,6 @@ import testchipip.soc.{OBUS}
 
 // A simple config demonstrating how to set up a basic chip in Chipyard
 class ChipLikeRocketConfig extends Config(
-  new freechips.rocketchip.subsystem.WithoutTLMonitors ++
-
   //==================================
   // Set up TestHarness
   //==================================
diff --git a/sims/firesim b/sims/firesim
index 23346f12..c95e7fbc 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 23346f12dcfd76125dd1d5bec162b72bf9f7d97b
+Subproject commit c95e7fbc8d4de833874338b2a7f14ab4dbd979f1