diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index b355c40d13..7cf051ce91 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -62,7 +62,9 @@ public class MogoApplication extends AbsMogoApplication {
         crashSystem.setDebug( BuildConfig.DEBUG );
         Logger.init( BuildConfig.DEBUG ? LogLevel.VERBOSE : LogLevel.VERBOSE );
 
-        MogoModulePaths.addModule( new MogoModule( PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME ) );
+        if( DebugConfig.isMapBased() ){
+            MogoModulePaths.addModule( new MogoModule( PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME ) );
+        }
         MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) );
 
         if ( DebugConfig.isLauncher() ) {
@@ -72,7 +74,7 @@ public class MogoApplication extends AbsMogoApplication {
         MogoModulePaths.addModule( new MogoModule( ServiceConst.PATH_TTS_CONFIG, ServiceConst.PATH_TTS_CONFIG ) );
 
         MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_WIDGETS, MogoServicePaths.PATH_WIDGETS ) );
-        if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD ) {
+        if ( DebugConfig.isMapBased() ) {
             MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) );
         }
 
diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt
index e92db55b72..6e6f4ac846 100644
--- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt
+++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/GuideBizManager.kt
@@ -4,9 +4,6 @@ import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_MAIN
 import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager
-import com.mogo.module.common.utils.CarSeries
-import com.mogo.module.common.utils.CarSeries.CAR_SERIES_C80X
-import com.mogo.module.common.utils.CarSeries.CAR_SERIES_F80X
 import com.mogo.module.guide.GuideConstant.Companion.PATH_GUIDE_MODULE_NAME
 import com.mogo.module.guide.fragment.GuideFragment
 import com.mogo.module.guide.util.SharedPreferenceUtil.hasGuide
@@ -50,9 +47,7 @@ object GuideBizManager {
         Logger.d("GuideBizManager", "removeGuideFragmentToStack")
         setGuideFinish()
         setGuideRecord()
-        serviceApi?.let {
-            it.fragmentManagerApi.pop()
-        }
+        serviceApi?.fragmentManagerApi?.pop()
         serviceApi?.adasControllerApi?.showADAS()
     }