diff --git a/cli/core/main.py b/cli/core/main.py
index f908d074..7bbccc72 100644
--- a/cli/core/main.py
+++ b/cli/core/main.py
@@ -10,14 +10,14 @@ from aitbc_cli.commands.system import system
 from aitbc_cli.commands.marketplace_cmd import marketplace
 from aitbc_cli.commands.chain import chain
 from aitbc_cli.commands.agent_sdk import agent
-from aitbc_cli.commands.analytics import analytics
-from aitbc_cli.commands.cross_chain import cross_chain
+# from aitbc_cli.commands.analytics import analytics  # Disabled - imports from non-existent aitbc_cli.core
+# from aitbc_cli.commands.cross_chain import cross_chain  # Disabled - may have similar issues
 # from aitbc_cli.commands.deployment import deployment  # Disabled - missing core.deployment module
-from aitbc_cli.commands.monitor import monitor
-from aitbc_cli.commands.node import node
-from aitbc_cli.commands.agent_comm import agent_comm
-from aitbc_cli.commands.exchange import exchange
-from aitbc_cli.commands.config import config_cmd
+# from aitbc_cli.commands.monitor import monitor  # Disabled - may have similar issues
+# from aitbc_cli.commands.node import node  # Disabled - imports from non-existent aitbc_cli.core
+# from aitbc_cli.commands.agent_comm import agent_comm  # Disabled - imports from non-existent aitbc_cli.core
+# from aitbc_cli.commands.exchange import exchange  # Disabled - may have similar issues
+# from aitbc_cli.commands.config import config_cmd  # Disabled - may have similar issues
 
 # Import island-specific commands
 from aitbc_cli.commands.gpu_marketplace import gpu
@@ -122,14 +122,14 @@ cli.add_command(system)
 cli.add_command(marketplace, name="market")
 cli.add_command(chain, name="blockchain")
 cli.add_command(agent, name="ai")
-cli.add_command(analytics)
-cli.add_command(cross_chain, name="crosschain")
+# cli.add_command(analytics)  # Disabled - imports from non-existent aitbc_cli.core
+# cli.add_command(cross_chain, name="crosschain")  # Disabled - may have similar issues
 # cli.add_command(deployment)  # Disabled - missing core.deployment module
-cli.add_command(monitor)
-cli.add_command(node)
-cli.add_command(agent_comm, name="agent")
-cli.add_command(exchange)
-cli.add_command(config_cmd, name="config")
+# cli.add_command(monitor)  # Disabled - may have similar issues
+# cli.add_command(node)  # Disabled - imports from non-existent aitbc_cli.core
+# cli.add_command(agent_comm, name="agent")  # Disabled - imports from non-existent aitbc_cli.core
+# cli.add_command(exchange)  # Disabled - may have similar issues
+# cli.add_command(config_cmd, name="config")  # Disabled - may have similar issues
 cli.add_command(list_wallets)
 cli.add_command(version)
 cli.add_command(gpu)