diff --git a/src/frontend/misccoms.c b/src/frontend/misccoms.c
index de469ec68..5501ff70b 100644
--- a/src/frontend/misccoms.c
+++ b/src/frontend/misccoms.c
@@ -57,8 +57,14 @@ com_quit(wordlist *wl)
             return;
 
 #ifndef SHARED_MODULE
-	if (!ft_ngdebug)
-	    exit(exitcode);
+    if (!ft_ngdebug && !ft_nutmeg) {
+        /* Destroy CKT */
+        struct circ *cc;
+        for (cc = ft_circuits; cc; cc = cc->ci_next)
+            if (SIMinfo.deleteCircuit)
+                SIMinfo.deleteCircuit(cc->ci_ckt);
+    }
+    exit(exitcode);
 #endif
 
     /* start to clean up the mess */
@@ -82,16 +88,6 @@ com_quit(wordlist *wl)
     }
 #endif
 
-#ifdef EXPERIMENTAL_CODE
-    /* Destroy CKT when quit. Add by Gong Ding, gdiso@ustc.edu */
-    if (!ft_nutmeg) {
-        struct circ *cc;
-        for (cc = ft_circuits; cc; cc = cc->ci_next)
-            if (SIMinfo.deleteCircuit)
-                SIMinfo.deleteCircuit(cc->ci_ckt);
-    }
-#endif
-
 #ifdef SHARED_MODULE
     /* Destroy CKT when quit. */
     if (!ft_nutmeg) {