diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index d72beb8d..14f674cf 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -175,12 +175,8 @@ void ObjectFactory::produce(void* args) {
   I2cCookie* bpxI2cCookie = new I2cCookie(addresses::BPX_BATTERY, 100, q7s::I2C_DEFAULT_DEV);
   BpxBatteryHandler* bpxHandler =
       new BpxBatteryHandler(objects::BPX_BATT_HANDLER, objects::I2C_COM_IF, bpxI2cCookie);
-#if OBSW_TEST_BPX_BATT == 1
-  bpxHandler->setToGoToNormalMode(true);
-  bpxHandler->setStartUpImmediately();
-#else
-  static_cast<void>(bpxHandler);
-#endif
+  //bpxHandler->setStartUpImmediately();
+  //bpxHandler->setToGoToNormalMode(true);
 #endif
 
   new FileSystemHandler(objects::FILE_SYSTEM_HANDLER);