diff --git a/src/frontend/mw_coms.c b/src/frontend/mw_coms.c
index 81f1067e8..0b0fb02c4 100644
--- a/src/frontend/mw_coms.c
+++ b/src/frontend/mw_coms.c
@@ -24,7 +24,6 @@ com_removecirc(wordlist *wl)
     struct circ *caux=NULL;
     struct plot *p;
     struct plot *paux;
-    struct wordlist *wlist;
     int auxCir=1,i,auxPlot;
 
     char* namecircuit;
@@ -32,9 +31,6 @@ com_removecirc(wordlist *wl)
 
     NG_IGNORE(wl);
 
-    /* Allocation of a temp wordlist */
-    wlist = TMALLOC(struct wordlist, 1);
-
     if (ft_curckt == NULL) {
         fprintf(cp_err, "Error: there is no circuit loaded.\n");
         return;
@@ -114,22 +110,18 @@ com_removecirc(wordlist *wl)
         ft_curckt->ci_nodes = cp_kwswitch(CT_NODENAMES, ft_circuits->ci_nodes);
     }*/
 if(ft_circuits&&caux->ci_next){
+    struct wordlist *wlist;
 	sprintf(buf,"%d",auxCir);
-    wlist->wl_next = NULL;
-    wlist->wl_prev = NULL;
-    wlist->wl_word = buf;
-    
+    wlist = wl_cons(buf, NULL);
 	com_scirc(wlist);
-	free(wlist);
+    wl_free(wlist);
 }
 else if(ft_circuits){
+    struct wordlist *wlist;
     sprintf(buf,"%d",(auxCir-1));
-    wlist->wl_next = NULL;
-    wlist->wl_prev = NULL;
-    wlist->wl_word = buf;
-    
+    wlist = wl_cons(buf, NULL);
 	com_scirc(wlist);
-	free(wlist);
+    wl_free(wlist);
     
 }
 else