diff --git a/openpower/configs/hostboot/rainier.config b/openpower/configs/hostboot/rainier.config
index 6ed3559..6777b66 100755
--- a/openpower/configs/hostboot/rainier.config
+++ b/openpower/configs/hostboot/rainier.config
@@ -52,11 +52,6 @@
 # Compile in hostboot runtime PRD
 #unset HBRT_PRD
 
-# Compile in hb rt HTMGT : Load/Start OCC
-#unset HTMGT
-#unset START_OCC_DURING_BOOT
-#unset CONSOLE_OUTPUT_OCC_COMM
-
 # PNOR flags
 unset PNOR_TWO_SIDE_SUPPORT
 
@@ -67,10 +62,6 @@
 set AXONE_BRINGUP
 set SUPPORT_EEPROM_CACHING
 
-# Disable checkstop analysis for IPL and runtime scenarios
-unset IPLTIME_CHECKSTOP_ANALYSIS
-unset ENABLE_CHECKSTOP_ANALYSIS
-
 # set for trace debug to console
 unset CONSOLE_OUTPUT_TRACE