diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml
index 09029c833..cb7a5b371 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEmdel.c.xml
@@ -40,41 +40,36 @@
 <admst:template match="code">
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
-
 #include &quot;ngspice/ngspice.h&quot;
 #include &quot;$(module)defs.h&quot;
 #include &quot;ngspice/sperror.h&quot;
 #include &quot;ngspice/suffix.h&quot;
 
-int $(module)mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
-
+int
+$(module)mDelete(GENmodel **models, IFuid modname, GENmodel *kill)
 {
-  register $(module)model **model = ($(module)model**)inModel;
-  register $(module)model *modfast =($(module)model*)kill;
-  $(module)instance *here;
-  $(module)instance *prev = NULL;
-  $(module)model **oldmod;
-  
-  oldmod = model;
-  for ( ; *model ; model = &amp;((*model)->$(module)nextModel)) {
-      if ((*model)->$(module)modName == modname ||
-          (modfast &amp;&amp; *model == modfast))
-	  goto delgot;
-      oldmod = model;   
-  } 
-  return(E_NOMOD);
-  
-  delgot:
-    *oldmod = (*model)->$(module)nextModel; /* cut deleted device out of list */
-    for (here = (*model)->$(module)instances; here; here = here->$(module)nextInstance)
-    {    if(prev) FREE(prev);
-         prev = here;
-    }
-    if(prev) FREE(prev);
-    FREE(*model);
-    return(OK);
-}
+    GENinstance *here;
+    GENmodel **prev = models;
+    GENmodel *model = *prev;
 
+    for (; model; model = model->GENnextModel) {
+        if (model->GENmodName == modname || (kill &amp;&amp; model == kill))
+  	    break;
+        prev = &amp;(model->GENnextModel);
+    }
+
+    if (!model)
+        return E_NOMOD;
+
+    *prev = model->GENnextModel;
+    for (here = model->GENinstances; here;) {
+        GENinstance *next_instance = here->GENnextInstance;
+        FREE(here);
+        here = next_instance;
+    }
+    FREE(model);
+    return OK;
+}
 </admst:template>
 
 <admst:for-each select="/module">