diff --git a/src/include/ngspice/devdefs.h b/src/include/ngspice/devdefs.h
index 942ae68ad..0e338e348 100644
--- a/src/include/ngspice/devdefs.h
+++ b/src/include/ngspice/devdefs.h
@@ -69,8 +69,8 @@ typedef struct SPICEdev {
         /* ac analysis loading function */
     int (*DEVaccept)(CKTcircuit*,GENmodel*); 
         /* subroutine to call on acceptance of a timepoint */
-    void (*DEVdestroy)(GENmodel**);   
-        /* subroutine to destroy all models and instances */
+    void (*DEVdestroy)(void);
+        /* subroutine to delete device specfic extra data */
     int (*DEVmodDelete)(GENmodel*);
         /* subroutine to delete a model */
     int (*DEVdelete)(GENinstance*);
diff --git a/src/include/ngspice/dllitf.h b/src/include/ngspice/dllitf.h
index 1353cdc75..a8d950968 100644
--- a/src/include/ngspice/dllitf.h
+++ b/src/include/ngspice/dllitf.h
@@ -28,7 +28,7 @@ struct coreInfo_t {
 	int       ((*dllitf_MIFconvTest)(GENmodel *, CKTcircuit *));
 	int       ((*dllitf_MIFdelete)(GENinstance *));
 	int       ((*dllitf_MIFmDelete)(GENmodel *));
-	void      ((*dllitf_MIFdestroy)(GENmodel **));
+	void      ((*dllitf_MIFdestroy)(void));
 	char *    ((*dllitf_MIFgettok)(char **));
 	char *    ((*dllitf_MIFget_token)(char **, Mif_Token_Type_t *));
 	Mif_Cntl_Src_Type_t ((*dllitf_MIFget_cntl_src_type)(Mif_Port_Type_t, Mif_Port_Type_t));
diff --git a/src/include/ngspice/mifproto.h b/src/include/ngspice/mifproto.h
index c412cd7ba..a4d2c718a 100644
--- a/src/include/ngspice/mifproto.h
+++ b/src/include/ngspice/mifproto.h
@@ -133,7 +133,7 @@ extern int MIFmDelete(
 );
 
 extern void MIFdestroy(
-    GENmodel **inModel
+    void
 );
 
 extern char  *MIFgettok(
diff --git a/src/spicelib/analysis/cktdest.c b/src/spicelib/analysis/cktdest.c
index 338ca71d8..f295a7ef5 100644
--- a/src/spicelib/analysis/cktdest.c
+++ b/src/spicelib/analysis/cktdest.c
@@ -37,11 +37,23 @@ CKTdestroy(CKTcircuit *ckt)
     }
 #endif
 
-    for (i=0;i<DEVmaxnum;i++) {
-        if ( DEVices[i] && DEVices[i]->DEVdestroy && ckt->CKThead[i] ) {
-            DEVices[i]->DEVdestroy (&(ckt->CKThead[i]));
+    for (i = 0; i < DEVmaxnum; i++)
+        if (DEVices[i]) {
+            GENmodel *model = ckt->CKThead[i];
+            while (model) {
+                GENmodel *next_model = model->GENnextModel;
+                GENinstance *inst = model->GENinstances;
+                while (inst) {
+                    GENinstance *next_inst = inst->GENnextInstance;
+                    DEVices[i]->DEVdelete(inst);
+                    inst = next_inst;
+                }
+                DEVices[i]->DEVmodDelete(model);
+                model = next_model;
+            }
+            if (DEVices[i]->DEVdestroy)
+                DEVices[i]->DEVdestroy();
         }
-    }
     for(i=0;i<=ckt->CKTmaxOrder+1;i++){
         FREE(ckt->CKTstates[i]);
     }
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml
index cd89f632a..5e5f9b6fd 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdest.c.xml
@@ -45,23 +45,8 @@
 #include &quot;ngspice/suffix.h&quot;
 
 void
-$(module)destroy(GENmodel **inModel)
+$(module)destroy(void)
 {
-    $(module)model *mod = *($(module)model**) inModel;
-
-    while (mod) {
-        $(module)model *next_mod = $(module)nextModel(mod);
-        $(module)instance *inst = $(module)instances(mod);
-        while (inst) {
-            $(module)instance *next_inst = $(module)nextInstance(inst);
-            $(module)delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        $(module)mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
 </admst:template>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml
index 9a8516782..63ada4f98 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml
@@ -51,7 +51,7 @@ extern int $(module)noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
 extern int $(module)pzLoad(GENmodel*,CKTcircuit*,SPcomplex*);
 extern int $(module)trunc(GENmodel*,CKTcircuit*,double*);
 extern int $(module)unsetup(GENmodel*,CKTcircuit*);
-extern void $(module)destroy(GENmodel**);
+extern void $(module)destroy(void);
 
 #endif
 
diff --git a/src/spicelib/devices/asrc/asrcdest.c b/src/spicelib/devices/asrc/asrcdest.c
index 0a22822b1..9e4a09d3b 100644
--- a/src/spicelib/devices/asrc/asrcdest.c
+++ b/src/spicelib/devices/asrc/asrcdest.c
@@ -9,25 +9,9 @@ Author: 1987 Kanwar Jit Singh
 
 
 void
-ASRCdestroy(GENmodel **inModel)
+ASRCdestroy(void)
 {
-    ASRCmodel *mod = *(ASRCmodel**) inModel;
-
-    while (mod) {
-        ASRCmodel *next_mod = ASRCnextModel(mod);
-        ASRCinstance *inst = ASRCinstances(mod);
-        while (inst) {
-            ASRCinstance *next_inst = ASRCnextInstance(inst);
-            ASRCdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        ASRCmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
     FREE(asrc_vals);
     FREE(asrc_derivs);
     asrc_nvals = 0;
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/asrc/asrcext.h b/src/spicelib/devices/asrc/asrcext.h
index 81510999e..c76065393 100644
--- a/src/spicelib/devices/asrc/asrcext.h
+++ b/src/spicelib/devices/asrc/asrcext.h
@@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles
 extern int ASRCask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue*);
 extern int ASRCconvTest(GENmodel *, CKTcircuit *);
 extern int ASRCdelete(GENinstance *);
-extern void ASRCdestroy(GENmodel **);
+extern void ASRCdestroy(void);
 extern int ASRCfindBr(CKTcircuit *, GENmodel *, IFuid);
 extern int ASRCload(GENmodel *, CKTcircuit *);
 extern int ASRCmDelete(GENmodel *);
diff --git a/src/spicelib/devices/bjt/bjtdest.c b/src/spicelib/devices/bjt/bjtdest.c
index f08bd7e87..f308c6787 100644
--- a/src/spicelib/devices/bjt/bjtdest.c
+++ b/src/spicelib/devices/bjt/bjtdest.c
@@ -14,21 +14,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-BJTdestroy(GENmodel **inModel)
+BJTdestroy(void)
 {
-    BJTmodel *mod = *(BJTmodel**) inModel;
-
-    while (mod) {
-        BJTmodel *next_mod = BJTnextModel(mod);
-        BJTinstance *inst = BJTinstances(mod);
-        while (inst) {
-            BJTinstance *next_inst = BJTnextInstance(inst);
-            BJTdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        BJTmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bjt/bjtext.h b/src/spicelib/devices/bjt/bjtext.h
index d4db1d732..39703b3b7 100644
--- a/src/spicelib/devices/bjt/bjtext.h
+++ b/src/spicelib/devices/bjt/bjtext.h
@@ -11,7 +11,7 @@ extern int BJTacLoad(GENmodel *,CKTcircuit*);
 extern int BJTask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BJTconvTest(GENmodel*,CKTcircuit*);
 extern int BJTdelete(GENinstance*);
-extern void BJTdestroy(GENmodel**);
+extern void BJTdestroy(void);
 extern int BJTgetic(GENmodel*,CKTcircuit*);
 extern int BJTload(GENmodel*,CKTcircuit*);
 extern int BJTmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/bsim1/b1dest.c b/src/spicelib/devices/bsim1/b1dest.c
index 2b2cd8b51..be7f72943 100644
--- a/src/spicelib/devices/bsim1/b1dest.c
+++ b/src/spicelib/devices/bsim1/b1dest.c
@@ -9,21 +9,6 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
 
 
 void
-B1destroy(GENmodel **inModel)
+B1destroy(void)
 {
-    B1model *mod = *(B1model**) inModel;
-
-    while (mod) {
-        B1model *next_mod = B1nextModel(mod);
-        B1instance *inst = B1instances(mod);
-        while (inst) {
-            B1instance *next_inst = B1nextInstance(inst);
-            B1delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        B1mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim1/bsim1ext.h b/src/spicelib/devices/bsim1/bsim1ext.h
index a0acd26c8..e1999c606 100644
--- a/src/spicelib/devices/bsim1/bsim1ext.h
+++ b/src/spicelib/devices/bsim1/bsim1ext.h
@@ -9,7 +9,7 @@ extern int B1acLoad(GENmodel *,CKTcircuit*);
 extern int B1ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int B1convTest(GENmodel *,CKTcircuit*);
 extern int B1delete(GENinstance*);
-extern void B1destroy(GENmodel**);
+extern void B1destroy(void);
 extern int B1getic(GENmodel*,CKTcircuit*);
 extern int B1load(GENmodel*,CKTcircuit*);
 extern int B1mAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/bsim2/b2dest.c b/src/spicelib/devices/bsim2/b2dest.c
index 82c6f7fda..bc4e7ea0a 100644
--- a/src/spicelib/devices/bsim2/b2dest.c
+++ b/src/spicelib/devices/bsim2/b2dest.c
@@ -9,21 +9,6 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
 
 
 void
-B2destroy(GENmodel **inModel)
+B2destroy(void)
 {
-    B2model *mod = *(B2model**) inModel;
-
-    while (mod) {
-        B2model *next_mod = B2nextModel(mod);
-        B2instance *inst = B2instances(mod);
-        while (inst) {
-            B2instance *next_inst = B2nextInstance(inst);
-            B2delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        B2mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim2/bsim2ext.h b/src/spicelib/devices/bsim2/bsim2ext.h
index 7c0938684..337db65ae 100644
--- a/src/spicelib/devices/bsim2/bsim2ext.h
+++ b/src/spicelib/devices/bsim2/bsim2ext.h
@@ -7,7 +7,7 @@ extern int B2acLoad(GENmodel *,CKTcircuit*);
 extern int B2ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int B2convTest(GENmodel *,CKTcircuit*);
 extern int B2delete(GENinstance*);
-extern void B2destroy(GENmodel**);
+extern void B2destroy(void);
 extern int B2getic(GENmodel*,CKTcircuit*);
 extern int B2load(GENmodel*,CKTcircuit*);
 extern int B2mAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/bsim3/b3dest.c b/src/spicelib/devices/bsim3/b3dest.c
index de9a8080f..5be833512 100644
--- a/src/spicelib/devices/bsim3/b3dest.c
+++ b/src/spicelib/devices/bsim3/b3dest.c
@@ -14,23 +14,6 @@
 
 
 void
-BSIM3destroy(GENmodel **inModel)
+BSIM3destroy(void)
 {
-    BSIM3model *mod = *(BSIM3model**) inModel;
-
-    while (mod) {
-        BSIM3model *next_mod = BSIM3nextModel(mod);
-        BSIM3instance *inst = BSIM3instances(mod);
-
-        while (inst) {
-            BSIM3instance *next_inst = BSIM3nextInstance(inst);
-            BSIM3delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-
-        BSIM3mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim3/bsim3ext.h b/src/spicelib/devices/bsim3/bsim3ext.h
index ae547203e..0c03e8be5 100644
--- a/src/spicelib/devices/bsim3/bsim3ext.h
+++ b/src/spicelib/devices/bsim3/bsim3ext.h
@@ -9,7 +9,7 @@ extern int BSIM3acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM3ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM3convTest(GENmodel *,CKTcircuit*);
 extern int BSIM3delete(GENinstance*);
-extern void BSIM3destroy(GENmodel**);
+extern void BSIM3destroy(void);
 extern int BSIM3getic(GENmodel*,CKTcircuit*);
 extern int BSIM3load(GENmodel*,CKTcircuit*);
 extern int BSIM3mAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soidddest.c b/src/spicelib/devices/bsim3soi_dd/b3soidddest.c
index 8d7388b3c..10042914b 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soidddest.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soidddest.c
@@ -16,21 +16,6 @@ Modified by Paolo Nenzi 2002
 
 
 void
-B3SOIDDdestroy(GENmodel **inModel)
+B3SOIDDdestroy(void)
 {
-    B3SOIDDmodel *mod = *(B3SOIDDmodel**) inModel;
-
-    while (mod) {
-        B3SOIDDmodel *next_mod = B3SOIDDnextModel(mod);
-        B3SOIDDinstance *inst = B3SOIDDinstances(mod);
-        while (inst) {
-            B3SOIDDinstance *next_inst = B3SOIDDnextInstance(inst);
-            B3SOIDDdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        B3SOIDDmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddext.h b/src/spicelib/devices/bsim3soi_dd/b3soiddext.h
index f74b3ac98..107b4d7ab 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddext.h
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddext.h
@@ -9,7 +9,7 @@ extern int B3SOIDDacLoad(GENmodel *,CKTcircuit*);
 extern int B3SOIDDask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int B3SOIDDconvTest(GENmodel *,CKTcircuit*);
 extern int B3SOIDDdelete(GENinstance*);
-extern void B3SOIDDdestroy(GENmodel**);
+extern void B3SOIDDdestroy(void);
 extern int B3SOIDDgetic(GENmodel*,CKTcircuit*);
 extern int B3SOIDDload(GENmodel*,CKTcircuit*);
 extern int B3SOIDDmAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifddest.c b/src/spicelib/devices/bsim3soi_fd/b3soifddest.c
index d0d928639..b7fbc744d 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifddest.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifddest.c
@@ -16,21 +16,6 @@ File: b3soifddest.c          98/5/01
 
 
 void
-B3SOIFDdestroy(GENmodel **inModel)
+B3SOIFDdestroy(void)
 {
-    B3SOIFDmodel *mod = *(B3SOIFDmodel**) inModel;
-
-    while (mod) {
-        B3SOIFDmodel *next_mod = B3SOIFDnextModel(mod);
-        B3SOIFDinstance *inst = B3SOIFDinstances(mod);
-        while (inst) {
-            B3SOIFDinstance *next_inst = B3SOIFDnextInstance(inst);
-            B3SOIFDdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        B3SOIFDmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdext.h b/src/spicelib/devices/bsim3soi_fd/b3soifdext.h
index 7bde5328b..a1a30408f 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdext.h
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdext.h
@@ -9,7 +9,7 @@ extern int B3SOIFDacLoad(GENmodel *,CKTcircuit*);
 extern int B3SOIFDask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int B3SOIFDconvTest(GENmodel *,CKTcircuit*);
 extern int B3SOIFDdelete(GENinstance*);
-extern void B3SOIFDdestroy(GENmodel**);
+extern void B3SOIFDdestroy(void);
 extern int B3SOIFDgetic(GENmodel*,CKTcircuit*);
 extern int B3SOIFDload(GENmodel*,CKTcircuit*);
 extern int B3SOIFDmAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipddest.c b/src/spicelib/devices/bsim3soi_pd/b3soipddest.c
index 9b54f8c5f..6ddbedc51 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipddest.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipddest.c
@@ -16,21 +16,6 @@ Modified by Paolo Nenzi 2002
 
 
 void
-B3SOIPDdestroy(GENmodel **inModel)
+B3SOIPDdestroy(void)
 {
-    B3SOIPDmodel *mod = *(B3SOIPDmodel**) inModel;
-
-    while (mod) {
-        B3SOIPDmodel *next_mod = B3SOIPDnextModel(mod);
-        B3SOIPDinstance *inst = B3SOIPDinstances(mod);
-        while (inst) {
-            B3SOIPDinstance *next_inst = B3SOIPDnextInstance(inst);
-            B3SOIPDdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        B3SOIPDmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdext.h b/src/spicelib/devices/bsim3soi_pd/b3soipdext.h
index 1cfa3ec63..78fb436b0 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdext.h
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdext.h
@@ -9,7 +9,7 @@ extern int B3SOIPDacLoad(GENmodel *,CKTcircuit*);
 extern int B3SOIPDask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int B3SOIPDconvTest(GENmodel *,CKTcircuit*);
 extern int B3SOIPDdelete(GENinstance*);
-extern void B3SOIPDdestroy(GENmodel**);
+extern void B3SOIPDdestroy(void);
 extern int B3SOIPDgetic(GENmodel*,CKTcircuit*);
 extern int B3SOIPDload(GENmodel*,CKTcircuit*);
 extern int B3SOIPDmAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/bsim3v0/b3v0dest.c b/src/spicelib/devices/bsim3v0/b3v0dest.c
index 5911efcf4..333422e0e 100644
--- a/src/spicelib/devices/bsim3v0/b3v0dest.c
+++ b/src/spicelib/devices/bsim3v0/b3v0dest.c
@@ -10,21 +10,6 @@ File: b3v0dest.c
 
 
 void
-BSIM3v0destroy(GENmodel **inModel)
+BSIM3v0destroy(void)
 {
-    BSIM3v0model *mod = *(BSIM3v0model**) inModel;
-
-    while (mod) {
-        BSIM3v0model *next_mod = BSIM3v0nextModel(mod);
-        BSIM3v0instance *inst = BSIM3v0instances(mod);
-        while (inst) {
-            BSIM3v0instance *next_inst = BSIM3v0nextInstance(inst);
-            BSIM3v0delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        BSIM3v0mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim3v0/bsim3v0ext.h b/src/spicelib/devices/bsim3v0/bsim3v0ext.h
index 13d38e90a..2c5fdfcf6 100644
--- a/src/spicelib/devices/bsim3v0/bsim3v0ext.h
+++ b/src/spicelib/devices/bsim3v0/bsim3v0ext.h
@@ -8,7 +8,7 @@ extern int BSIM3v0acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM3v0ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM3v0convTest(GENmodel *,CKTcircuit*);
 extern int BSIM3v0delete(GENinstance*);
-extern void BSIM3v0destroy(GENmodel**);
+extern void BSIM3v0destroy(void);
 extern int BSIM3v0getic(GENmodel*,CKTcircuit*);
 extern int BSIM3v0load(GENmodel*,CKTcircuit*);
 extern int BSIM3v0mAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/bsim3v1/b3v1dest.c b/src/spicelib/devices/bsim3v1/b3v1dest.c
index 8cad26e0a..73d7626ea 100644
--- a/src/spicelib/devices/bsim3v1/b3v1dest.c
+++ b/src/spicelib/devices/bsim3v1/b3v1dest.c
@@ -16,21 +16,6 @@
 
 
 void
-BSIM3v1destroy(GENmodel **inModel)
+BSIM3v1destroy(void)
 {
-    BSIM3v1model *mod = *(BSIM3v1model**) inModel;
-
-    while (mod) {
-        BSIM3v1model *next_mod = BSIM3v1nextModel(mod);
-        BSIM3v1instance *inst = BSIM3v1instances(mod);
-        while (inst) {
-            BSIM3v1instance *next_inst = BSIM3v1nextInstance(inst);
-            BSIM3v1delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        BSIM3v1mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim3v1/bsim3v1ext.h b/src/spicelib/devices/bsim3v1/bsim3v1ext.h
index d17f5f724..972b089ad 100644
--- a/src/spicelib/devices/bsim3v1/bsim3v1ext.h
+++ b/src/spicelib/devices/bsim3v1/bsim3v1ext.h
@@ -9,7 +9,7 @@ extern int BSIM3v1acLoad(GENmodel *, CKTcircuit *);
 extern int BSIM3v1ask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
 extern int BSIM3v1convTest(GENmodel *, CKTcircuit *);
 extern int BSIM3v1delete(GENinstance *);
-extern void BSIM3v1destroy(GENmodel **);
+extern void BSIM3v1destroy(void);
 extern int BSIM3v1getic(GENmodel *, CKTcircuit *);
 extern int BSIM3v1load(GENmodel *, CKTcircuit *);
 extern int BSIM3v1mAsk(CKTcircuit *, GENmodel *, int, IFvalue *);
diff --git a/src/spicelib/devices/bsim3v32/b3v32dest.c b/src/spicelib/devices/bsim3v32/b3v32dest.c
index 2938dfa03..805748613 100644
--- a/src/spicelib/devices/bsim3v32/b3v32dest.c
+++ b/src/spicelib/devices/bsim3v32/b3v32dest.c
@@ -15,22 +15,6 @@
 
 
 void
-BSIM3v32destroy (GENmodel **inModel)
+BSIM3v32destroy (void)
 {
-    BSIM3v32model *mod = *(BSIM3v32model**) inModel;
-
-    while (mod) {
-        BSIM3v32model *next_mod = BSIM3v32nextModel(mod);
-        BSIM3v32instance *inst = BSIM3v32instances(mod);
-        while (inst) {
-            BSIM3v32instance *next_inst = BSIM3v32nextInstance(inst);
-            BSIM3v32delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-
-        BSIM3v32mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim3v32/bsim3v32ext.h b/src/spicelib/devices/bsim3v32/bsim3v32ext.h
index 597501d66..9d02c7e3b 100644
--- a/src/spicelib/devices/bsim3v32/bsim3v32ext.h
+++ b/src/spicelib/devices/bsim3v32/bsim3v32ext.h
@@ -10,7 +10,7 @@ extern int BSIM3v32acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM3v32ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM3v32convTest(GENmodel *,CKTcircuit*);
 extern int BSIM3v32delete(GENinstance*);
-extern void BSIM3v32destroy(GENmodel**);
+extern void BSIM3v32destroy(void);
 extern int BSIM3v32getic(GENmodel*,CKTcircuit*);
 extern int BSIM3v32load(GENmodel*,CKTcircuit*);
 extern int BSIM3v32mAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/bsim4/b4dest.c b/src/spicelib/devices/bsim4/b4dest.c
index 45027d9b2..bb75d330a 100644
--- a/src/spicelib/devices/bsim4/b4dest.c
+++ b/src/spicelib/devices/bsim4/b4dest.c
@@ -64,21 +64,6 @@
 
 
 void
-BSIM4destroy(GENmodel **inModel)
+BSIM4destroy(void)
 {
-    BSIM4model *mod = *(BSIM4model**) inModel;
-
-    while (mod) {
-        BSIM4model *next_mod = BSIM4nextModel(mod);
-        BSIM4instance *inst = BSIM4instances(mod);
-        while (inst) {
-            BSIM4instance *next_inst = BSIM4nextInstance(inst);
-            BSIM4delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        BSIM4mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim4/bsim4ext.h b/src/spicelib/devices/bsim4/bsim4ext.h
index 814c48137..ba69998ec 100644
--- a/src/spicelib/devices/bsim4/bsim4ext.h
+++ b/src/spicelib/devices/bsim4/bsim4ext.h
@@ -62,7 +62,7 @@ extern int BSIM4acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM4ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM4convTest(GENmodel *,CKTcircuit*);
 extern int BSIM4delete(GENinstance*);
-extern void BSIM4destroy(GENmodel**);
+extern void BSIM4destroy(void);
 extern int BSIM4getic(GENmodel*,CKTcircuit*);
 extern int BSIM4load(GENmodel*,CKTcircuit*);
 extern int BSIM4mAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/bsim4v5/b4v5dest.c b/src/spicelib/devices/bsim4v5/b4v5dest.c
index 13caccacb..7bfa2b5fd 100644
--- a/src/spicelib/devices/bsim4v5/b4v5dest.c
+++ b/src/spicelib/devices/bsim4v5/b4v5dest.c
@@ -14,21 +14,6 @@
 
 
 void
-BSIM4v5destroy(GENmodel **inModel)
+BSIM4v5destroy(void)
 {
-    BSIM4v5model *mod = *(BSIM4v5model**) inModel;
-
-    while (mod) {
-        BSIM4v5model *next_mod = BSIM4v5nextModel(mod);
-        BSIM4v5instance *inst = BSIM4v5instances(mod);
-        while (inst) {
-            BSIM4v5instance *next_inst = BSIM4v5nextInstance(inst);
-            BSIM4v5delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        BSIM4v5mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim4v5/bsim4v5ext.h b/src/spicelib/devices/bsim4v5/bsim4v5ext.h
index d9f826f34..3e043b9bc 100644
--- a/src/spicelib/devices/bsim4v5/bsim4v5ext.h
+++ b/src/spicelib/devices/bsim4v5/bsim4v5ext.h
@@ -9,7 +9,7 @@ extern int BSIM4v5acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM4v5ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM4v5convTest(GENmodel *,CKTcircuit*);
 extern int BSIM4v5delete(GENinstance*);
-extern void BSIM4v5destroy(GENmodel**);
+extern void BSIM4v5destroy(void);
 extern int BSIM4v5getic(GENmodel*,CKTcircuit*);
 extern int BSIM4v5load(GENmodel*,CKTcircuit*);
 extern int BSIM4v5mAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/bsim4v6/b4v6dest.c b/src/spicelib/devices/bsim4v6/b4v6dest.c
index 149bcba63..422d2b25f 100644
--- a/src/spicelib/devices/bsim4v6/b4v6dest.c
+++ b/src/spicelib/devices/bsim4v6/b4v6dest.c
@@ -16,21 +16,6 @@
 
 
 void
-BSIM4v6destroy(GENmodel **inModel)
+BSIM4v6destroy(void)
 {
-    BSIM4v6model *mod = *(BSIM4v6model**) inModel;
-
-    while (mod) {
-        BSIM4v6model *next_mod = BSIM4v6nextModel(mod);
-        BSIM4v6instance *inst = BSIM4v6instances(mod);
-        while (inst) {
-            BSIM4v6instance *next_inst = BSIM4v6nextInstance(inst);
-            BSIM4v6delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        BSIM4v6mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim4v6/bsim4v6ext.h b/src/spicelib/devices/bsim4v6/bsim4v6ext.h
index 336d1c7aa..814262b33 100644
--- a/src/spicelib/devices/bsim4v6/bsim4v6ext.h
+++ b/src/spicelib/devices/bsim4v6/bsim4v6ext.h
@@ -9,7 +9,7 @@ extern int BSIM4v6acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM4v6ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM4v6convTest(GENmodel *,CKTcircuit*);
 extern int BSIM4v6delete(GENinstance*);
-extern void BSIM4v6destroy(GENmodel**);
+extern void BSIM4v6destroy(void);
 extern int BSIM4v6getic(GENmodel*,CKTcircuit*);
 extern int BSIM4v6load(GENmodel*,CKTcircuit*);
 extern int BSIM4v6mAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/bsim4v7/b4v7dest.c b/src/spicelib/devices/bsim4v7/b4v7dest.c
index f0aa6d8f1..80e02685b 100644
--- a/src/spicelib/devices/bsim4v7/b4v7dest.c
+++ b/src/spicelib/devices/bsim4v7/b4v7dest.c
@@ -16,21 +16,6 @@
 
 
 void
-BSIM4v7destroy(GENmodel **inModel)
+BSIM4v7destroy(void)
 {
-    BSIM4v7model *mod = *(BSIM4v7model**) inModel;
-
-    while (mod) {
-        BSIM4v7model *next_mod = BSIM4v7nextModel(mod);
-        BSIM4v7instance *inst = BSIM4v7instances(mod);
-        while (inst) {
-            BSIM4v7instance *next_inst = BSIM4v7nextInstance(inst);
-            BSIM4v7delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        BSIM4v7mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsim4v7/bsim4v7ext.h b/src/spicelib/devices/bsim4v7/bsim4v7ext.h
index 9304b0cbb..c92df8694 100644
--- a/src/spicelib/devices/bsim4v7/bsim4v7ext.h
+++ b/src/spicelib/devices/bsim4v7/bsim4v7ext.h
@@ -9,7 +9,7 @@ extern int BSIM4v7acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM4v7ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM4v7convTest(GENmodel *,CKTcircuit*);
 extern int BSIM4v7delete(GENinstance*);
-extern void BSIM4v7destroy(GENmodel**);
+extern void BSIM4v7destroy(void);
 extern int BSIM4v7getic(GENmodel*,CKTcircuit*);
 extern int BSIM4v7load(GENmodel*,CKTcircuit*);
 extern int BSIM4v7mAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/bsimsoi/b4soidest.c b/src/spicelib/devices/bsimsoi/b4soidest.c
index bde5a389e..afa8a63b4 100644
--- a/src/spicelib/devices/bsimsoi/b4soidest.c
+++ b/src/spicelib/devices/bsimsoi/b4soidest.c
@@ -20,21 +20,6 @@
 
 
 void
-B4SOIdestroy(GENmodel **inModel)
+B4SOIdestroy(void)
 {
-    B4SOImodel *mod = *(B4SOImodel**) inModel;
-
-    while (mod) {
-        B4SOImodel *next_mod = B4SOInextModel(mod);
-        B4SOIinstance *inst = B4SOIinstances(mod);
-        while (inst) {
-            B4SOIinstance *next_inst = B4SOInextInstance(inst);
-            B4SOIdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        B4SOImDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/bsimsoi/b4soiext.h b/src/spicelib/devices/bsimsoi/b4soiext.h
index 8f8c00f01..014baab32 100644
--- a/src/spicelib/devices/bsimsoi/b4soiext.h
+++ b/src/spicelib/devices/bsimsoi/b4soiext.h
@@ -11,7 +11,7 @@ extern int B4SOIacLoad(GENmodel *,CKTcircuit*);
 extern int B4SOIask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int B4SOIconvTest(GENmodel *,CKTcircuit*);
 extern int B4SOIdelete(GENinstance*);
-extern void B4SOIdestroy(GENmodel**);
+extern void B4SOIdestroy(void);
 extern int B4SOIgetic(GENmodel*,CKTcircuit*);
 extern int B4SOIload(GENmodel*,CKTcircuit*);
 extern int B4SOImAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/cap/capdest.c b/src/spicelib/devices/cap/capdest.c
index 0afff135b..36d28510f 100644
--- a/src/spicelib/devices/cap/capdest.c
+++ b/src/spicelib/devices/cap/capdest.c
@@ -10,21 +10,6 @@ Modified: September 2003 Paolo Nenzi
 
 
 void
-CAPdestroy(GENmodel **inModel)
+CAPdestroy(void)
 {
-    CAPmodel *mod = *(CAPmodel**) inModel;
-
-    while (mod) {
-        CAPmodel *next_mod = CAPnextModel(mod);
-        CAPinstance *inst = CAPinstances(mod);
-        while (inst) {
-            CAPinstance *next_inst = CAPnextInstance(inst);
-            CAPdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        CAPmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/cap/capext.h b/src/spicelib/devices/cap/capext.h
index 6e1a6fd61..c4e55d0b1 100644
--- a/src/spicelib/devices/cap/capext.h
+++ b/src/spicelib/devices/cap/capext.h
@@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles
 extern int CAPacLoad(GENmodel*,CKTcircuit*);
 extern int CAPask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int CAPdelete(GENinstance*);
-extern void CAPdestroy(GENmodel**);
+extern void CAPdestroy(void);
 extern int CAPgetic(GENmodel*,CKTcircuit*);
 extern int CAPload(GENmodel*,CKTcircuit*);
 extern int CAPmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/cccs/cccsdest.c b/src/spicelib/devices/cccs/cccsdest.c
index 583daa238..f43af0291 100644
--- a/src/spicelib/devices/cccs/cccsdest.c
+++ b/src/spicelib/devices/cccs/cccsdest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-CCCSdestroy(GENmodel **inModel)
+CCCSdestroy(void)
 {
-    CCCSmodel *mod = *(CCCSmodel**) inModel;
-
-    while (mod) {
-        CCCSmodel *next_mod = CCCSnextModel(mod);
-        CCCSinstance *inst = CCCSinstances(mod);
-        while (inst) {
-            CCCSinstance *next_inst = CCCSnextInstance(inst);
-            CCCSdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        CCCSmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/cccs/cccsext.h b/src/spicelib/devices/cccs/cccsext.h
index d855bbf53..e04166d76 100644
--- a/src/spicelib/devices/cccs/cccsext.h
+++ b/src/spicelib/devices/cccs/cccsext.h
@@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles
 
 extern int CCCSask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int CCCSdelete(GENinstance*);
-extern void CCCSdestroy(GENmodel**);
+extern void CCCSdestroy(void);
 extern int CCCSload(GENmodel*,CKTcircuit*);
 extern int CCCSmDelete(GENmodel*);
 extern int CCCSparam(int,IFvalue*,GENinstance*,IFvalue*);
diff --git a/src/spicelib/devices/ccvs/ccvsdest.c b/src/spicelib/devices/ccvs/ccvsdest.c
index 1ff0c5b77..e8fa2e8af 100644
--- a/src/spicelib/devices/ccvs/ccvsdest.c
+++ b/src/spicelib/devices/ccvs/ccvsdest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-CCVSdestroy(GENmodel **inModel)
+CCVSdestroy(void)
 {
-    CCVSmodel *mod = *(CCVSmodel**) inModel;
-
-    while (mod) {
-        CCVSmodel *next_mod = CCVSnextModel(mod);
-        CCVSinstance *inst = CCVSinstances(mod);
-        while (inst) {
-            CCVSinstance *next_inst = CCVSnextInstance(inst);
-            CCVSdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        CCVSmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/ccvs/ccvsext.h b/src/spicelib/devices/ccvs/ccvsext.h
index 29f7a7740..7dd27e30a 100644
--- a/src/spicelib/devices/ccvs/ccvsext.h
+++ b/src/spicelib/devices/ccvs/ccvsext.h
@@ -5,7 +5,7 @@ Author: 1985 Thomas L. Quarles
 
 extern int CCVSask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int CCVSdelete(GENinstance*);
-extern void CCVSdestroy(GENmodel**);
+extern void CCVSdestroy(void);
 extern int CCVSfindBr(CKTcircuit*,GENmodel*,IFuid);
 extern int CCVSload(GENmodel*,CKTcircuit*);
 extern int CCVSmDelete(GENmodel*);
diff --git a/src/spicelib/devices/cpl/cpldest.c b/src/spicelib/devices/cpl/cpldest.c
index 135c9464b..7200aee79 100644
--- a/src/spicelib/devices/cpl/cpldest.c
+++ b/src/spicelib/devices/cpl/cpldest.c
@@ -10,21 +10,6 @@ Author: 1992 Charles Hough
 
 
 void
-CPLdestroy(GENmodel **inModel)
+CPLdestroy(void)
 {
-    CPLmodel *mod = *(CPLmodel **) inModel;
-
-    while (mod) {
-        CPLmodel *next_mod = CPLnextModel(mod);
-        CPLinstance *inst = CPLinstances(mod);
-        while (inst) {
-            CPLinstance *next_inst = CPLnextInstance(inst);
-            CPLdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        CPLmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/cpl/cplext.h b/src/spicelib/devices/cpl/cplext.h
index 048bea92c..e9575edc1 100644
--- a/src/spicelib/devices/cpl/cplext.h
+++ b/src/spicelib/devices/cpl/cplext.h
@@ -6,7 +6,7 @@ reserved.
 /* extern int CPLaccept(CKTcircuit*, GENmodel*); */
 extern int CPLask(CKTcircuit*, GENinstance*, int, IFvalue*, IFvalue*);
 extern int CPLdelete(GENinstance*);
-extern void CPLdestroy(GENmodel**);
+extern void CPLdestroy(void);
 extern int CPLload(GENmodel*, CKTcircuit*);
 extern int CPLmAsk(CKTcircuit*, GENmodel*, int, IFvalue*);
 extern int CPLmDelete(GENmodel*);
diff --git a/src/spicelib/devices/csw/cswdest.c b/src/spicelib/devices/csw/cswdest.c
index 3e2c28843..a64f831e3 100644
--- a/src/spicelib/devices/csw/cswdest.c
+++ b/src/spicelib/devices/csw/cswdest.c
@@ -9,21 +9,6 @@ Author: 1985 Gordon Jacobs
 
 
 void
-CSWdestroy(GENmodel **inModel)
+CSWdestroy(void)
 {
-    CSWmodel *mod = *(CSWmodel**) inModel;
-
-    while (mod) {
-        CSWmodel *next_mod = CSWnextModel(mod);
-        CSWinstance *inst = CSWinstances(mod);
-        while (inst) {
-            CSWinstance *next_inst = CSWnextInstance(inst);
-            CSWdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        CSWmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/csw/cswext.h b/src/spicelib/devices/csw/cswext.h
index 42cce69ee..22d74de49 100644
--- a/src/spicelib/devices/csw/cswext.h
+++ b/src/spicelib/devices/csw/cswext.h
@@ -7,7 +7,7 @@ Modified: 2000 AlansFixes
 extern int CSWask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int CSWacLoad(GENmodel*,CKTcircuit*);
 extern int CSWdelete(GENinstance*);
-extern void CSWdestroy(GENmodel**);
+extern void CSWdestroy(void);
 extern int CSWload(GENmodel*,CKTcircuit*);
 extern int CSWmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
 extern int CSWmDelete(GENmodel*);
diff --git a/src/spicelib/devices/dio/diodest.c b/src/spicelib/devices/dio/diodest.c
index 2306d3a40..169d5332e 100644
--- a/src/spicelib/devices/dio/diodest.c
+++ b/src/spicelib/devices/dio/diodest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-DIOdestroy(GENmodel **inModel)
+DIOdestroy(void)
 {
-    DIOmodel *mod = *(DIOmodel**) inModel;
-
-    while (mod) {
-        DIOmodel *next_mod = DIOnextModel(mod);
-        DIOinstance *inst = DIOinstances(mod);
-        while (inst) {
-            DIOinstance *next_inst = DIOnextInstance(inst);
-            DIOdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        DIOmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/dio/dioext.h b/src/spicelib/devices/dio/dioext.h
index 0f1a91852..94a493da4 100644
--- a/src/spicelib/devices/dio/dioext.h
+++ b/src/spicelib/devices/dio/dioext.h
@@ -8,7 +8,7 @@ extern int DIOacLoad(GENmodel*,CKTcircuit*);
 extern int DIOask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int DIOconvTest(GENmodel *,CKTcircuit*);
 extern int DIOdelete(GENinstance*);
-extern void DIOdestroy(GENmodel**);
+extern void DIOdestroy(void);
 extern int DIOgetic(GENmodel*,CKTcircuit*);
 extern int DIOload(GENmodel*,CKTcircuit*);
 extern int DIOmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/hfet1/hfetdest.c b/src/spicelib/devices/hfet1/hfetdest.c
index e54b82182..7cade9aa3 100644
--- a/src/spicelib/devices/hfet1/hfetdest.c
+++ b/src/spicelib/devices/hfet1/hfetdest.c
@@ -9,21 +9,6 @@ Modified: Paolo Nenzi
 
 
 void
-HFETAdestroy(GENmodel **inModel)
+HFETAdestroy(void)
 {
-    HFETAmodel *mod = *(HFETAmodel**) inModel;
-
-    while (mod) {
-        HFETAmodel *next_mod = HFETAnextModel(mod);
-        HFETAinstance *inst = HFETAinstances(mod);
-        while (inst) {
-            HFETAinstance *next_inst = HFETAnextInstance(inst);
-            HFETAdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        HFETAmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/hfet1/hfetext.h b/src/spicelib/devices/hfet1/hfetext.h
index dc8bea209..ee499df29 100644
--- a/src/spicelib/devices/hfet1/hfetext.h
+++ b/src/spicelib/devices/hfet1/hfetext.h
@@ -6,7 +6,7 @@ Modified: Paolo Nenzi
 extern int HFETAacLoad(GENmodel*,CKTcircuit*);
 extern int HFETAask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int HFETAdelete(GENinstance*);
-extern void HFETAdestroy(GENmodel**);
+extern void HFETAdestroy(void);
 extern int HFETAgetic(GENmodel*,CKTcircuit*);
 extern int HFETAload(GENmodel*,CKTcircuit*);
 extern int HFETAmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/hfet2/hfet2dest.c b/src/spicelib/devices/hfet2/hfet2dest.c
index 0240cb370..106865818 100644
--- a/src/spicelib/devices/hfet2/hfet2dest.c
+++ b/src/spicelib/devices/hfet2/hfet2dest.c
@@ -9,21 +9,6 @@ Modified: Paolo Nenzi
 
 
 void
-HFET2destroy(GENmodel **inModel)
+HFET2destroy(void)
 {
-    HFET2model *mod = *(HFET2model**) inModel;
-
-    while (mod) {
-        HFET2model *next_mod = HFET2nextModel(mod);
-        HFET2instance *inst = HFET2instances(mod);
-        while (inst) {
-            HFET2instance *next_inst = HFET2nextInstance(inst);
-            HFET2delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        HFET2mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/hfet2/hfet2ext.h b/src/spicelib/devices/hfet2/hfet2ext.h
index f009d3b9c..760e03256 100644
--- a/src/spicelib/devices/hfet2/hfet2ext.h
+++ b/src/spicelib/devices/hfet2/hfet2ext.h
@@ -6,7 +6,7 @@ Author: Trond Ytterdal
 extern int  HFET2acLoad(GENmodel*,CKTcircuit*);
 extern int  HFET2ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int  HFET2delete(GENinstance*);
-extern void HFET2destroy(GENmodel**);
+extern void HFET2destroy(void);
 extern int  HFET2getic(GENmodel*,CKTcircuit*);
 extern int  HFET2load(GENmodel*,CKTcircuit*);
 extern int  HFET2mAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/hisim2/hsm2dest.c b/src/spicelib/devices/hisim2/hsm2dest.c
index 238518158..b74cae252 100644
--- a/src/spicelib/devices/hisim2/hsm2dest.c
+++ b/src/spicelib/devices/hisim2/hsm2dest.c
@@ -60,21 +60,6 @@ to others."
 
 
 void
-HSM2destroy(GENmodel **inModel)
+HSM2destroy(void)
 {
-    HSM2model *mod = *(HSM2model**) inModel;
-
-    while (mod) {
-        HSM2model *next_mod = HSM2nextModel(mod);
-        HSM2instance *inst = HSM2instances(mod);
-        while (inst) {
-            HSM2instance *next_inst = HSM2nextInstance(inst);
-            HSM2delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        HSM2mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/hisim2/hsm2ext.h b/src/spicelib/devices/hisim2/hsm2ext.h
index c6e48517b..8a84cddd8 100644
--- a/src/spicelib/devices/hisim2/hsm2ext.h
+++ b/src/spicelib/devices/hisim2/hsm2ext.h
@@ -19,7 +19,7 @@ extern int HSM2acLoad(GENmodel *,CKTcircuit*);
 extern int HSM2ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int HSM2convTest(GENmodel *,CKTcircuit*);
 extern int HSM2delete(GENinstance*);
-extern void HSM2destroy(GENmodel**);
+extern void HSM2destroy(void);
 extern int HSM2getic(GENmodel*,CKTcircuit*);
 extern int HSM2load(GENmodel*,CKTcircuit*);
 extern int HSM2mAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/hisimhv1/hsmhvdest.c b/src/spicelib/devices/hisimhv1/hsmhvdest.c
index 3a3d5926f..ed75a539d 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvdest.c
+++ b/src/spicelib/devices/hisimhv1/hsmhvdest.c
@@ -21,21 +21,6 @@
 
 
 void
-HSMHVdestroy(GENmodel **inModel)
+HSMHVdestroy(void)
 {
-    HSMHVmodel *mod = *(HSMHVmodel**) inModel;
-
-    while (mod) {
-        HSMHVmodel *next_mod = HSMHVnextModel(mod);
-        HSMHVinstance *inst = HSMHVinstances(mod);
-        while (inst) {
-            HSMHVinstance *next_inst = HSMHVnextInstance(inst);
-            HSMHVdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        HSMHVmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/hisimhv1/hsmhvext.h b/src/spicelib/devices/hisimhv1/hsmhvext.h
index 1677aa4e2..780c7a3cf 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvext.h
+++ b/src/spicelib/devices/hisimhv1/hsmhvext.h
@@ -19,7 +19,7 @@ extern int HSMHVacLoad(GENmodel *,CKTcircuit*);
 extern int HSMHVask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int HSMHVconvTest(GENmodel *,CKTcircuit*);
 extern int HSMHVdelete(GENinstance*);
-extern void HSMHVdestroy(GENmodel**);
+extern void HSMHVdestroy(void);
 extern int HSMHVgetic(GENmodel*,CKTcircuit*);
 extern int HSMHVload(GENmodel*,CKTcircuit*);
 extern int HSMHVmAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/hisimhv2/hsmhv2dest.c b/src/spicelib/devices/hisimhv2/hsmhv2dest.c
index 5caf72713..f18b95701 100644
--- a/src/spicelib/devices/hisimhv2/hsmhv2dest.c
+++ b/src/spicelib/devices/hisimhv2/hsmhv2dest.c
@@ -63,21 +63,6 @@ June 2008 (revised October 2011)
 
 
 void
-HSMHV2destroy(GENmodel **inModel)
+HSMHV2destroy(void)
 {
-    HSMHV2model *mod = *(HSMHV2model**) inModel;
-
-    while (mod) {
-        HSMHV2model *next_mod = HSMHV2nextModel(mod);
-        HSMHV2instance *inst = HSMHV2instances(mod);
-        while (inst) {
-            HSMHV2instance *next_inst = HSMHV2nextInstance(inst);
-            HSMHV2delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        HSMHV2mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/hisimhv2/hsmhv2ext.h b/src/spicelib/devices/hisimhv2/hsmhv2ext.h
index 7e4a64a99..28e2f9d66 100644
--- a/src/spicelib/devices/hisimhv2/hsmhv2ext.h
+++ b/src/spicelib/devices/hisimhv2/hsmhv2ext.h
@@ -19,7 +19,7 @@ extern int HSMHV2acLoad(GENmodel *,CKTcircuit*);
 extern int HSMHV2ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int HSMHV2convTest(GENmodel *,CKTcircuit*);
 extern int HSMHV2delete(GENinstance*);
-extern void HSMHV2destroy(GENmodel**);
+extern void HSMHV2destroy(void);
 extern int HSMHV2getic(GENmodel*,CKTcircuit*);
 extern int HSMHV2load(GENmodel*,CKTcircuit*);
 extern int HSMHV2mAsk(CKTcircuit*,GENmodel *,int, IFvalue*);
diff --git a/src/spicelib/devices/ind/inddest.c b/src/spicelib/devices/ind/inddest.c
index db0b1b47c..83d4a35dd 100644
--- a/src/spicelib/devices/ind/inddest.c
+++ b/src/spicelib/devices/ind/inddest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-INDdestroy(GENmodel **inModel)
+INDdestroy(void)
 {
-    INDmodel *mod = *(INDmodel**) inModel;
-
-    while (mod) {
-        INDmodel *next_mod = INDnextModel(mod);
-        INDinstance *inst = INDinstances(mod);
-        while (inst) {
-            INDinstance *next_inst = INDnextInstance(inst);
-            INDdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        INDmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/ind/indext.h b/src/spicelib/devices/ind/indext.h
index 959798af5..3fd334818 100644
--- a/src/spicelib/devices/ind/indext.h
+++ b/src/spicelib/devices/ind/indext.h
@@ -9,7 +9,7 @@ extern int INDacLoad(GENmodel*,CKTcircuit*);
 extern int INDask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int INDmAsk(CKTcircuit*, GENmodel*, int, IFvalue*);
 extern int INDdelete(GENinstance*);
-extern void INDdestroy(GENmodel**);
+extern void INDdestroy(void);
 extern int INDload(GENmodel*,CKTcircuit*);
 extern int INDmDelete(GENmodel*);
 extern int INDmParam(int, IFvalue*, GENmodel*);
@@ -28,7 +28,7 @@ extern int INDtrunc(GENmodel*,CKTcircuit*,double*);
 extern int MUTacLoad(GENmodel*,CKTcircuit*);
 extern int MUTask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int MUTdelete(GENinstance*);
-extern void MUTdestroy(GENmodel**);
+extern void MUTdestroy(void);
 extern int MUTmDelete(GENmodel*);
 extern int MUTparam(int,IFvalue*,GENinstance*,IFvalue*);
 extern int MUTpzLoad(GENmodel*,CKTcircuit*,SPcomplex*);
diff --git a/src/spicelib/devices/ind/mutdest.c b/src/spicelib/devices/ind/mutdest.c
index 93e917638..87b511639 100644
--- a/src/spicelib/devices/ind/mutdest.c
+++ b/src/spicelib/devices/ind/mutdest.c
@@ -11,23 +11,8 @@ Author: 1985 Thomas L. Quarles
 #ifdef MUTUAL
 
 void
-MUTdestroy(GENmodel **inModel)
+MUTdestroy(void)
 {
-    MUTmodel *mod = *(MUTmodel**) inModel;
-
-    while (mod) {
-        MUTmodel *next_mod = MUTnextModel(mod);
-        MUTinstance *inst = MUTinstances(mod);
-        while (inst) {
-            MUTinstance *next_inst = MUTnextInstance(inst);
-            MUTdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        MUTmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
 
 #endif
diff --git a/src/spicelib/devices/isrc/isrcdest.c b/src/spicelib/devices/isrc/isrcdest.c
index 7a7d2b490..80b777641 100644
--- a/src/spicelib/devices/isrc/isrcdest.c
+++ b/src/spicelib/devices/isrc/isrcdest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-ISRCdestroy(GENmodel **inModel)
+ISRCdestroy(void)
 {
-    ISRCmodel *mod = *(ISRCmodel**) inModel;
-
-    while (mod) {
-        ISRCmodel *next_mod = ISRCnextModel(mod);
-        ISRCinstance *inst = ISRCinstances(mod);
-        while (inst) {
-            ISRCinstance *next_inst = ISRCnextInstance(inst);
-            ISRCdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        ISRCmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/isrc/isrcext.h b/src/spicelib/devices/isrc/isrcext.h
index a453f01e3..8146c6074 100644
--- a/src/spicelib/devices/isrc/isrcext.h
+++ b/src/spicelib/devices/isrc/isrcext.h
@@ -7,7 +7,7 @@ extern int ISRCaccept(CKTcircuit*,GENmodel*);
 extern int ISRCacLoad(GENmodel*,CKTcircuit*);
 extern int ISRCask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int ISRCdelete(GENinstance*);
-extern void ISRCdestroy(GENmodel**);
+extern void ISRCdestroy(void);
 extern int ISRCload(GENmodel*,CKTcircuit*);
 extern int ISRCmDelete(GENmodel*);
 extern int ISRCparam(int,IFvalue*,GENinstance*,IFvalue*);
diff --git a/src/spicelib/devices/jfet/jfetdest.c b/src/spicelib/devices/jfet/jfetdest.c
index 12c843a31..7cef1f77a 100644
--- a/src/spicelib/devices/jfet/jfetdest.c
+++ b/src/spicelib/devices/jfet/jfetdest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-JFETdestroy(GENmodel **inModel)
+JFETdestroy(void)
 {
-    JFETmodel *mod = *(JFETmodel**) inModel;
-
-    while (mod) {
-        JFETmodel *next_mod = JFETnextModel(mod);
-        JFETinstance *inst = JFETinstances(mod);
-        while (inst) {
-            JFETinstance *next_inst = JFETnextInstance(inst);
-            JFETdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        JFETmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/jfet/jfetext.h b/src/spicelib/devices/jfet/jfetext.h
index 882a45f73..d90800e75 100644
--- a/src/spicelib/devices/jfet/jfetext.h
+++ b/src/spicelib/devices/jfet/jfetext.h
@@ -7,7 +7,7 @@ Modified: 2000 AlansFixes
 extern int JFETacLoad(GENmodel*,CKTcircuit*);
 extern int JFETask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int JFETdelete(GENinstance*);
-extern void JFETdestroy(GENmodel**);
+extern void JFETdestroy(void);
 extern int JFETgetic(GENmodel*,CKTcircuit*);
 extern int JFETload(GENmodel*,CKTcircuit*);
 extern int JFETmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/jfet2/jfet2dest.c b/src/spicelib/devices/jfet2/jfet2dest.c
index 5549c24b2..db9e122bd 100644
--- a/src/spicelib/devices/jfet2/jfet2dest.c
+++ b/src/spicelib/devices/jfet2/jfet2dest.c
@@ -13,21 +13,6 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker )
 
 
 void
-JFET2destroy(GENmodel **inModel)
+JFET2destroy(void)
 {
-    JFET2model *mod = *(JFET2model**) inModel;
-
-    while (mod) {
-        JFET2model *next_mod = JFET2nextModel(mod);
-        JFET2instance *inst = JFET2instances(mod);
-        while (inst) {
-            JFET2instance *next_inst = JFET2nextInstance(inst);
-            JFET2delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        JFET2mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/jfet2/jfet2ext.h b/src/spicelib/devices/jfet2/jfet2ext.h
index d498027ce..de9d6b4e1 100644
--- a/src/spicelib/devices/jfet2/jfet2ext.h
+++ b/src/spicelib/devices/jfet2/jfet2ext.h
@@ -10,7 +10,7 @@ Modified to add PS model and new parameter definitions ( Anthony E. Parker )
 extern int JFET2acLoad(GENmodel*,CKTcircuit*);
 extern int JFET2ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int JFET2delete(GENinstance*);
-extern void JFET2destroy(GENmodel**);
+extern void JFET2destroy(void);
 extern int JFET2getic(GENmodel*,CKTcircuit*);
 extern int JFET2load(GENmodel*,CKTcircuit*);
 extern int JFET2mAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/ltra/ltradest.c b/src/spicelib/devices/ltra/ltradest.c
index 3b0908959..af83f771f 100644
--- a/src/spicelib/devices/ltra/ltradest.c
+++ b/src/spicelib/devices/ltra/ltradest.c
@@ -9,21 +9,6 @@ Author: 1990 Jaijeet S. Roychowdhury
 
 
 void
-LTRAdestroy(GENmodel **inModel)
+LTRAdestroy(void)
 {
-    LTRAmodel *mod = *(LTRAmodel **) inModel;
-
-    while (mod) {
-        LTRAmodel *next_mod = LTRAnextModel(mod);
-        LTRAinstance *inst = LTRAinstances(mod);
-        while (inst) {
-            LTRAinstance *next_inst = LTRAnextInstance(inst);
-            LTRAdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        LTRAmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/ltra/ltraext.h b/src/spicelib/devices/ltra/ltraext.h
index fa1f3d972..b0b93c341 100644
--- a/src/spicelib/devices/ltra/ltraext.h
+++ b/src/spicelib/devices/ltra/ltraext.h
@@ -9,7 +9,7 @@ extern int LTRAaccept(CKTcircuit*,GENmodel*);
 extern int LTRAask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int LTRAacLoad(GENmodel*,CKTcircuit*);
 extern int LTRAdelete(GENinstance*);
-extern void LTRAdestroy(GENmodel**);
+extern void LTRAdestroy(void);
 extern int LTRAload(GENmodel*,CKTcircuit*);
 extern int LTRAmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
 extern int LTRAmDelete(GENmodel*);
diff --git a/src/spicelib/devices/mes/mesdest.c b/src/spicelib/devices/mes/mesdest.c
index 98f2a4f84..5e99240a4 100644
--- a/src/spicelib/devices/mes/mesdest.c
+++ b/src/spicelib/devices/mes/mesdest.c
@@ -9,21 +9,6 @@ Author: 1985 S. Hwang
 
 
 void
-MESdestroy(GENmodel **inModel)
+MESdestroy(void)
 {
-    MESmodel *mod = *(MESmodel**) inModel;
-
-    while (mod) {
-        MESmodel *next_mod = MESnextModel(mod);
-        MESinstance *inst = MESinstances(mod);
-        while (inst) {
-            MESinstance *next_inst = MESnextInstance(inst);
-            MESdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        MESmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/mes/mesext.h b/src/spicelib/devices/mes/mesext.h
index aff6503b3..94e896484 100644
--- a/src/spicelib/devices/mes/mesext.h
+++ b/src/spicelib/devices/mes/mesext.h
@@ -7,7 +7,7 @@ Modified: 2000 AlansFixes
 extern int MESacLoad(GENmodel*,CKTcircuit*);
 extern int MESask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int MESdelete(GENinstance*);
-extern void MESdestroy(GENmodel**);
+extern void MESdestroy(void);
 extern int MESgetic(GENmodel*,CKTcircuit*);
 extern int MESload(GENmodel*,CKTcircuit*);
 extern int MESmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/mesa/mesadest.c b/src/spicelib/devices/mesa/mesadest.c
index 3efff78ed..e087790eb 100644
--- a/src/spicelib/devices/mesa/mesadest.c
+++ b/src/spicelib/devices/mesa/mesadest.c
@@ -9,21 +9,6 @@ Author: Trond Ytterdal
 
 
 void
-MESAdestroy(GENmodel **inModel)
+MESAdestroy(void)
 {
-    MESAmodel *mod = *(MESAmodel**) inModel;
-
-    while (mod) {
-        MESAmodel *next_mod = MESAnextModel(mod);
-        MESAinstance *inst = MESAinstances(mod);
-        while (inst) {
-            MESAinstance *next_inst = MESAnextInstance(inst);
-            MESAdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        MESAmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/mesa/mesaext.h b/src/spicelib/devices/mesa/mesaext.h
index 673344efc..2b322d611 100644
--- a/src/spicelib/devices/mesa/mesaext.h
+++ b/src/spicelib/devices/mesa/mesaext.h
@@ -6,7 +6,7 @@ Author: Trond Ytterdal
 extern int MESAacLoad(GENmodel*,CKTcircuit*);
 extern int MESAask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int MESAdelete(GENinstance*);
-extern void MESAdestroy(GENmodel**);
+extern void MESAdestroy(void);
 extern int MESAgetic(GENmodel*,CKTcircuit*);
 extern int MESAload(GENmodel*,CKTcircuit*);
 extern int MESAmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/mos1/mos1dest.c b/src/spicelib/devices/mos1/mos1dest.c
index 3518dd093..d7993452b 100644
--- a/src/spicelib/devices/mos1/mos1dest.c
+++ b/src/spicelib/devices/mos1/mos1dest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-MOS1destroy(GENmodel **inModel)
+MOS1destroy(void)
 {
-    MOS1model *mod = *(MOS1model**) inModel;
-
-    while (mod) {
-        MOS1model *next_mod = MOS1nextModel(mod);
-        MOS1instance *inst = MOS1instances(mod);
-        while (inst) {
-            MOS1instance *next_inst = MOS1nextInstance(inst);
-            MOS1delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        MOS1mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/mos1/mos1ext.h b/src/spicelib/devices/mos1/mos1ext.h
index 1ebd0bdfb..a81756679 100644
--- a/src/spicelib/devices/mos1/mos1ext.h
+++ b/src/spicelib/devices/mos1/mos1ext.h
@@ -7,7 +7,7 @@ Modified: 2000 AlansFixes
 extern int MOS1acLoad(GENmodel *,CKTcircuit*);
 extern int MOS1ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int MOS1delete(GENinstance*);
-extern void MOS1destroy(GENmodel**);
+extern void MOS1destroy(void);
 extern int MOS1getic(GENmodel*,CKTcircuit*);
 extern int MOS1load(GENmodel*,CKTcircuit*);
 extern int MOS1mAsk(CKTcircuit *,GENmodel *,int,IFvalue*);
diff --git a/src/spicelib/devices/mos2/mos2dest.c b/src/spicelib/devices/mos2/mos2dest.c
index bf27bb025..53450734e 100644
--- a/src/spicelib/devices/mos2/mos2dest.c
+++ b/src/spicelib/devices/mos2/mos2dest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-MOS2destroy(GENmodel **inModel)
+MOS2destroy(void)
 {
-    MOS2model *mod = *(MOS2model **) inModel;
-
-    while (mod) {
-        MOS2model *next_mod = MOS2nextModel(mod);
-        MOS2instance *inst = MOS2instances(mod);
-        while (inst) {
-            MOS2instance *next_inst = MOS2nextInstance(inst);
-            MOS2delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        MOS2mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/mos2/mos2ext.h b/src/spicelib/devices/mos2/mos2ext.h
index c725494e8..28e46973e 100644
--- a/src/spicelib/devices/mos2/mos2ext.h
+++ b/src/spicelib/devices/mos2/mos2ext.h
@@ -9,7 +9,7 @@ extern int MOS2ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int MOS2mAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
 extern int MOS2convTest(GENmodel*,CKTcircuit*);
 extern int MOS2delete(GENinstance*);
-extern void MOS2destroy(GENmodel**);
+extern void MOS2destroy(void);
 extern int MOS2getic(GENmodel*,CKTcircuit*);
 extern int MOS2load(GENmodel*,CKTcircuit*);
 extern int MOS2mDelete(GENmodel*);
diff --git a/src/spicelib/devices/mos3/mos3dest.c b/src/spicelib/devices/mos3/mos3dest.c
index 225a41f35..b5f162e10 100644
--- a/src/spicelib/devices/mos3/mos3dest.c
+++ b/src/spicelib/devices/mos3/mos3dest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-MOS3destroy(GENmodel **inModel)
+MOS3destroy(void)
 {
-    MOS3model *mod = *(MOS3model **) inModel;
-
-    while (mod) {
-        MOS3model *next_mod = MOS3nextModel(mod);
-        MOS3instance *inst = MOS3instances(mod);
-        while (inst) {
-            MOS3instance *next_inst = MOS3nextInstance(inst);
-            MOS3delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        MOS3mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/mos3/mos3ext.h b/src/spicelib/devices/mos3/mos3ext.h
index 88e3f53be..12e587f76 100644
--- a/src/spicelib/devices/mos3/mos3ext.h
+++ b/src/spicelib/devices/mos3/mos3ext.h
@@ -8,7 +8,7 @@ extern int MOS3acLoad(GENmodel*,CKTcircuit*);
 extern int MOS3ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int MOS3convTest(GENmodel *,CKTcircuit *);
 extern int MOS3delete(GENinstance*);
-extern void MOS3destroy(GENmodel**);
+extern void MOS3destroy(void);
 extern int MOS3getic(GENmodel*,CKTcircuit*);
 extern int MOS3load(GENmodel*,CKTcircuit*);
 extern int MOS3mAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/mos6/mos6dest.c b/src/spicelib/devices/mos6/mos6dest.c
index 2cc323ec2..23f48d53c 100644
--- a/src/spicelib/devices/mos6/mos6dest.c
+++ b/src/spicelib/devices/mos6/mos6dest.c
@@ -9,21 +9,6 @@ Author: 1989 Takayasu Sakurai
 
 
 void
-MOS6destroy(GENmodel **inModel)
+MOS6destroy(void)
 {
-    MOS6model *mod = *(MOS6model**) inModel;
-
-    while (mod) {
-        MOS6model *next_mod = MOS6nextModel(mod);
-        MOS6instance *inst = MOS6instances(mod);
-        while (inst) {
-            MOS6instance *next_inst = MOS6nextInstance(inst);
-            MOS6delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        MOS6mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/mos6/mos6ext.h b/src/spicelib/devices/mos6/mos6ext.h
index c3ae2baac..8bacf5ed0 100644
--- a/src/spicelib/devices/mos6/mos6ext.h
+++ b/src/spicelib/devices/mos6/mos6ext.h
@@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles
 extern int MOS6acLoad(GENmodel *,CKTcircuit*);
 extern int MOS6ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int MOS6delete(GENinstance*);
-extern void MOS6destroy(GENmodel**);
+extern void MOS6destroy(void);
 extern int MOS6getic(GENmodel*,CKTcircuit*);
 extern int MOS6load(GENmodel*,CKTcircuit*);
 extern int MOS6mAsk(CKTcircuit *,GENmodel *,int,IFvalue*);
diff --git a/src/spicelib/devices/mos9/mos9dest.c b/src/spicelib/devices/mos9/mos9dest.c
index e82af2758..961f52c46 100644
--- a/src/spicelib/devices/mos9/mos9dest.c
+++ b/src/spicelib/devices/mos9/mos9dest.c
@@ -10,21 +10,6 @@ Modified: Alan Gillespie
 
 
 void
-MOS9destroy(GENmodel **inModel)
+MOS9destroy(void)
 {
-    MOS9model *mod = *(MOS9model **) inModel;
-
-    while (mod) {
-        MOS9model *next_mod = MOS9nextModel(mod);
-        MOS9instance *inst = MOS9instances(mod);
-        while (inst) {
-            MOS9instance *next_inst = MOS9nextInstance(inst);
-            MOS9delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        MOS9mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/mos9/mos9ext.h b/src/spicelib/devices/mos9/mos9ext.h
index 0c153ad57..985be5ed8 100644
--- a/src/spicelib/devices/mos9/mos9ext.h
+++ b/src/spicelib/devices/mos9/mos9ext.h
@@ -8,7 +8,7 @@ extern int MOS9acLoad(GENmodel*,CKTcircuit*);
 extern int MOS9ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int MOS9convTest(GENmodel *,CKTcircuit *);
 extern int MOS9delete(GENinstance*);
-extern void MOS9destroy(GENmodel**);
+extern void MOS9destroy(void);
 extern int MOS9getic(GENmodel*,CKTcircuit*);
 extern int MOS9load(GENmodel*,CKTcircuit*);
 extern int MOS9mAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/nbjt/nbjtdest.c b/src/spicelib/devices/nbjt/nbjtdest.c
index 88af4856b..3acdd2571 100644
--- a/src/spicelib/devices/nbjt/nbjtdest.c
+++ b/src/spicelib/devices/nbjt/nbjtdest.c
@@ -15,21 +15,6 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 void
-NBJTdestroy(GENmodel **inModel)
+NBJTdestroy(void)
 {
-    NBJTmodel *mod = *(NBJTmodel **) inModel;
-
-    while (mod) {
-        NBJTmodel *next_mod = NBJTnextModel(mod);
-        NBJTinstance *inst = NBJTinstances(mod);
-        while (inst) {
-            NBJTinstance *next_inst = NBJTnextInstance(inst);
-            NBJTdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        NBJTmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/nbjt/nbjtext.h b/src/spicelib/devices/nbjt/nbjtext.h
index c6b015102..d2dbf1923 100644
--- a/src/spicelib/devices/nbjt/nbjtext.h
+++ b/src/spicelib/devices/nbjt/nbjtext.h
@@ -9,7 +9,7 @@ Author: 1987 Karti Mayaram
 extern int NBJTacLoad(GENmodel *, CKTcircuit *);
 extern int NBJTask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
 extern int NBJTdelete(GENinstance *);
-extern void NBJTdestroy(GENmodel **);
+extern void NBJTdestroy(void);
 extern int NBJTgetic(GENmodel *, CKTcircuit *);
 extern int NBJTload(GENmodel *, CKTcircuit *);
 extern int NBJTmDelete(GENmodel *);
diff --git a/src/spicelib/devices/nbjt2/nbjt2ext.h b/src/spicelib/devices/nbjt2/nbjt2ext.h
index cb2fe071b..f7d14d450 100644
--- a/src/spicelib/devices/nbjt2/nbjt2ext.h
+++ b/src/spicelib/devices/nbjt2/nbjt2ext.h
@@ -10,7 +10,7 @@ Author: 1987 Karti Mayaram
 extern int NBJT2acLoad(GENmodel *, CKTcircuit *);
 extern int NBJT2ask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
 extern int NBJT2delete(GENinstance *);
-extern void NBJT2destroy(GENmodel **);
+extern void NBJT2destroy(void);
 extern int NBJT2getic(GENmodel *, CKTcircuit *);
 extern int NBJT2load(GENmodel *, CKTcircuit *);
 extern int NBJT2mDelete(GENmodel *);
diff --git a/src/spicelib/devices/nbjt2/nbt2dest.c b/src/spicelib/devices/nbjt2/nbt2dest.c
index 928e56237..e3cf03312 100644
--- a/src/spicelib/devices/nbjt2/nbt2dest.c
+++ b/src/spicelib/devices/nbjt2/nbt2dest.c
@@ -14,21 +14,6 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 void
-NBJT2destroy(GENmodel **inModel)
+NBJT2destroy(void)
 {
-    NBJT2model *mod = *(NBJT2model **) inModel;
-
-    while (mod) {
-        NBJT2model *next_mod = NBJT2nextModel(mod);
-        NBJT2instance *inst = NBJT2instances(mod);
-        while (inst) {
-            NBJT2instance *next_inst = NBJT2nextInstance(inst);
-            NBJT2delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        NBJT2mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/ndev/ndevdest.c b/src/spicelib/devices/ndev/ndevdest.c
index a37917b53..fb99e5a64 100644
--- a/src/spicelib/devices/ndev/ndevdest.c
+++ b/src/spicelib/devices/ndev/ndevdest.c
@@ -10,21 +10,6 @@ University of Science and Technology of China
 
 
 void
-NDEVdestroy(GENmodel **inModel)
+NDEVdestroy(void)
 {
-    NDEVmodel *mod = *(NDEVmodel **) inModel;
-
-    while (mod) {
-        NDEVmodel *next_mod = NDEVnextModel(mod);
-        NDEVinstance *inst = NDEVinstances(mod);
-        while (inst) {
-            NDEVinstance *next_inst = NDEVnextInstance(inst);
-            NDEVdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        NDEVmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/ndev/ndevext.h b/src/spicelib/devices/ndev/ndevext.h
index b09ad1727..78a4543ba 100644
--- a/src/spicelib/devices/ndev/ndevext.h
+++ b/src/spicelib/devices/ndev/ndevext.h
@@ -10,7 +10,7 @@ Author: 1987 Karti Mayaram
 extern int NDEVacLoad(GENmodel *, CKTcircuit *);
 extern int NDEVask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
 extern int NDEVdelete(GENinstance *);
-extern void NDEVdestroy(GENmodel **);
+extern void NDEVdestroy(void);
 extern int NDEVgetic(GENmodel *, CKTcircuit *);
 extern int NDEVload(GENmodel *, CKTcircuit *);
 extern int NDEVaccept(CKTcircuit *, GENmodel *);
diff --git a/src/spicelib/devices/numd/numddest.c b/src/spicelib/devices/numd/numddest.c
index 158a2fa8e..f8d7f2c18 100644
--- a/src/spicelib/devices/numd/numddest.c
+++ b/src/spicelib/devices/numd/numddest.c
@@ -15,21 +15,6 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 void
-NUMDdestroy(GENmodel **inModel)
+NUMDdestroy(void)
 {
-    NUMDmodel *mod = *(NUMDmodel **) inModel;
-
-    while (mod) {
-        NUMDmodel *next_mod = NUMDnextModel(mod);
-        NUMDinstance *inst = NUMDinstances(mod);
-        while (inst) {
-            NUMDinstance *next_inst = NUMDnextInstance(inst);
-            NUMDdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        NUMDmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/numd/numdext.h b/src/spicelib/devices/numd/numdext.h
index 30d5ab4b2..27919c0ed 100644
--- a/src/spicelib/devices/numd/numdext.h
+++ b/src/spicelib/devices/numd/numdext.h
@@ -10,7 +10,7 @@ Author: 1987 Karti Mayaram
 extern int NUMDacLoad(GENmodel *, CKTcircuit *);
 extern int NUMDask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
 extern int NUMDdelete(GENinstance *);
-extern void NUMDdestroy(GENmodel **);
+extern void NUMDdestroy(void);
 extern int NUMDgetic(GENmodel *, CKTcircuit *);
 extern int NUMDload(GENmodel *, CKTcircuit *);
 extern int NUMDmDelete(GENmodel *);
diff --git a/src/spicelib/devices/numd2/nud2dest.c b/src/spicelib/devices/numd2/nud2dest.c
index 9e8ae00e0..90d584ae3 100644
--- a/src/spicelib/devices/numd2/nud2dest.c
+++ b/src/spicelib/devices/numd2/nud2dest.c
@@ -15,21 +15,6 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 void
-NUMD2destroy(GENmodel **inModel)
+NUMD2destroy(void)
 {
-    NUMD2model *mod = *(NUMD2model **) inModel;
-
-    while (mod) {
-        NUMD2model *next_mod  = NUMD2nextModel(mod);
-        NUMD2instance *inst = NUMD2instances(mod);
-        while (inst) {
-            NUMD2instance *next_inst = NUMD2nextInstance(inst);
-            NUMD2delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        NUMD2mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/numd2/numd2ext.h b/src/spicelib/devices/numd2/numd2ext.h
index d22e7e95d..50c986417 100644
--- a/src/spicelib/devices/numd2/numd2ext.h
+++ b/src/spicelib/devices/numd2/numd2ext.h
@@ -10,7 +10,7 @@ Author: 1987 Karti Mayaram
 extern int NUMD2acLoad(GENmodel *, CKTcircuit *);
 extern int NUMD2ask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
 extern int NUMD2delete(GENinstance *);
-extern void NUMD2destroy(GENmodel **);
+extern void NUMD2destroy(void);
 extern int NUMD2getic(GENmodel *, CKTcircuit *);
 extern int NUMD2load(GENmodel *, CKTcircuit *);
 extern int NUMD2mDelete(GENmodel *);
diff --git a/src/spicelib/devices/numos/nummdest.c b/src/spicelib/devices/numos/nummdest.c
index 009999d25..c68fb8ed5 100644
--- a/src/spicelib/devices/numos/nummdest.c
+++ b/src/spicelib/devices/numos/nummdest.c
@@ -14,21 +14,6 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 void
-NUMOSdestroy(GENmodel **inModel)
+NUMOSdestroy(void)
 {
-    NUMOSmodel *mod = *(NUMOSmodel **) inModel;
-
-    while (mod) {
-        NUMOSmodel *next_mod = NUMOSnextModel(mod);
-        NUMOSinstance *inst = NUMOSinstances(mod);
-        while (inst) {
-            NUMOSinstance *next_inst = NUMOSnextInstance(inst);
-            NUMOSdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        NUMOSmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/numos/numosext.h b/src/spicelib/devices/numos/numosext.h
index 818b4850f..db0975ffd 100644
--- a/src/spicelib/devices/numos/numosext.h
+++ b/src/spicelib/devices/numos/numosext.h
@@ -10,7 +10,7 @@ Author: 1987 Karti Mayaram
 extern int NUMOSacLoad(GENmodel *, CKTcircuit *);
 extern int NUMOSask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
 extern int NUMOSdelete(GENinstance *);
-extern void NUMOSdestroy(GENmodel **);
+extern void NUMOSdestroy(void);
 extern int NUMOSgetic(GENmodel *, CKTcircuit *);
 extern int NUMOSload(GENmodel *, CKTcircuit *);
 extern int NUMOSmDelete(GENmodel *);
diff --git a/src/spicelib/devices/res/resdest.c b/src/spicelib/devices/res/resdest.c
index 25d60f74c..1d338c864 100644
--- a/src/spicelib/devices/res/resdest.c
+++ b/src/spicelib/devices/res/resdest.c
@@ -9,21 +9,6 @@ Modified: Apr 2000 - Paolo Nenzi
 
 
 void
-RESdestroy(GENmodel **inModel)
+RESdestroy(void)
 {
-    RESmodel *mod = *(RESmodel **) inModel;
-
-    while (mod) {
-        RESmodel *next_mod = RESnextModel(mod);
-        RESinstance *inst = RESinstances(mod);
-        while (inst) {
-            RESinstance *next_inst = RESnextInstance(inst);
-            RESdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        RESmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/res/resext.h b/src/spicelib/devices/res/resext.h
index b54e9e2fb..31c1f3a90 100644
--- a/src/spicelib/devices/res/resext.h
+++ b/src/spicelib/devices/res/resext.h
@@ -5,7 +5,7 @@ Author: 1985 Thomas L. Quarles
 
 extern int RESask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int RESdelete(GENinstance*);
-extern void RESdestroy(GENmodel**);
+extern void RESdestroy(void);
 extern int RESload(GENmodel*,CKTcircuit*);
 extern int RESacload(GENmodel*,CKTcircuit*);
 extern int RESmodAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/soi3/soi3dest.c b/src/spicelib/devices/soi3/soi3dest.c
index 5da10de53..e6510283c 100644
--- a/src/spicelib/devices/soi3/soi3dest.c
+++ b/src/spicelib/devices/soi3/soi3dest.c
@@ -26,21 +26,6 @@ ngspice integration
 
 
 void
-SOI3destroy(GENmodel **inModel)
+SOI3destroy(void)
 {
-    SOI3model *mod = *(SOI3model**) inModel;
-
-    while (mod) {
-        SOI3model *next_mod = SOI3nextModel(mod);
-        SOI3instance *inst = SOI3instances(mod);
-        while (inst) {
-            SOI3instance *next_inst = SOI3nextInstance(inst);
-            SOI3delete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        SOI3mDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/soi3/soi3ext.h b/src/spicelib/devices/soi3/soi3ext.h
index 0b3998efb..75f0f2a24 100644
--- a/src/spicelib/devices/soi3/soi3ext.h
+++ b/src/spicelib/devices/soi3/soi3ext.h
@@ -24,7 +24,7 @@ ngspice integration
 extern int SOI3acLoad(GENmodel *,CKTcircuit*);
 extern int SOI3ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int SOI3delete(GENinstance*);
-extern void SOI3destroy(GENmodel**);
+extern void SOI3destroy(void);
 extern int SOI3getic(GENmodel*,CKTcircuit*);
 extern int SOI3load(GENmodel*,CKTcircuit*);
 extern int SOI3mAsk(CKTcircuit *,GENmodel *,int,IFvalue*);
diff --git a/src/spicelib/devices/sw/swdest.c b/src/spicelib/devices/sw/swdest.c
index 225b14d8a..03f408c3d 100644
--- a/src/spicelib/devices/sw/swdest.c
+++ b/src/spicelib/devices/sw/swdest.c
@@ -9,21 +9,6 @@ Author: 1985 Gordon Jacobs
 
 
 void
-SWdestroy(GENmodel **inModel)
+SWdestroy(void)
 {
-    SWmodel *mod = *(SWmodel**) inModel;
-
-    while (mod) {
-        SWmodel *next_mod = SWnextModel(mod);
-        SWinstance *inst = SWinstances(mod);
-        while (inst) {
-            SWinstance *next_inst = SWnextInstance(inst);
-            SWdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        SWmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/sw/swext.h b/src/spicelib/devices/sw/swext.h
index 6131dea66..c134a2c58 100644
--- a/src/spicelib/devices/sw/swext.h
+++ b/src/spicelib/devices/sw/swext.h
@@ -7,7 +7,7 @@ Modified: 2000 AlansFixes
 extern int SWacLoad(GENmodel*,CKTcircuit*);
 extern int SWask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int SWdelete(GENinstance*);
-extern void SWdestroy(GENmodel**);
+extern void SWdestroy(void);
 extern int SWload(GENmodel*,CKTcircuit*);
 extern int SWmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
 extern int SWmDelete(GENmodel*);
diff --git a/src/spicelib/devices/tra/tradest.c b/src/spicelib/devices/tra/tradest.c
index e096521d3..ae9f983ec 100644
--- a/src/spicelib/devices/tra/tradest.c
+++ b/src/spicelib/devices/tra/tradest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-TRAdestroy(GENmodel **inModel)
+TRAdestroy(void)
 {
-    TRAmodel *mod = *(TRAmodel **) inModel;
-
-    while (mod) {
-        TRAmodel *next_mod = TRAnextModel(mod);
-        TRAinstance *inst = TRAinstances(mod);
-        while (inst) {
-            TRAinstance *next_inst = TRAnextInstance(inst);
-            TRAdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        TRAmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/tra/traext.h b/src/spicelib/devices/tra/traext.h
index 5ab08e43e..43a153249 100644
--- a/src/spicelib/devices/tra/traext.h
+++ b/src/spicelib/devices/tra/traext.h
@@ -7,7 +7,7 @@ extern int TRAacLoad(GENmodel*,CKTcircuit*);
 extern int TRAaccept(CKTcircuit*,GENmodel*);
 extern int TRAask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int TRAdelete(GENinstance*);
-extern void TRAdestroy(GENmodel**);
+extern void TRAdestroy(void);
 extern int TRAload(GENmodel*,CKTcircuit*);
 extern int TRAmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
 extern int TRAmDelete(GENmodel*);
diff --git a/src/spicelib/devices/txl/txldest.c b/src/spicelib/devices/txl/txldest.c
index 5ef2b88ae..84951d75f 100644
--- a/src/spicelib/devices/txl/txldest.c
+++ b/src/spicelib/devices/txl/txldest.c
@@ -10,21 +10,6 @@ Author: 1992 Charles Hough
 
 
 void
-TXLdestroy(GENmodel **inModel)
+TXLdestroy(void)
 {
-    TXLmodel *mod = *(TXLmodel **) inModel;
-
-    while (mod) {
-        TXLmodel *next_mod = TXLnextModel(mod);
-        TXLinstance *inst = TXLinstances(mod);
-        while (inst) {
-            TXLinstance *next_inst = TXLnextInstance(inst);
-            TXLdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        TXLmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/txl/txlext.h b/src/spicelib/devices/txl/txlext.h
index 1d36a298e..bd827956a 100644
--- a/src/spicelib/devices/txl/txlext.h
+++ b/src/spicelib/devices/txl/txlext.h
@@ -2,7 +2,7 @@
 extern int TXLaccept(CKTcircuit*,GENmodel*);
 extern int TXLask(CKTcircuit*, GENinstance*, int, IFvalue*, IFvalue*);
 extern int TXLdelete(GENinstance*);
-extern void TXLdestroy(GENmodel**);
+extern void TXLdestroy(void);
 extern int TXLfindBr(CKTcircuit*, GENmodel*, IFuid);
 extern int TXLload(GENmodel*,CKTcircuit*);
 extern int TXLmodAsk(CKTcircuit*, GENmodel*, int, IFvalue*);
diff --git a/src/spicelib/devices/urc/urcdest.c b/src/spicelib/devices/urc/urcdest.c
index 7f0e1ae23..6c5587cb3 100644
--- a/src/spicelib/devices/urc/urcdest.c
+++ b/src/spicelib/devices/urc/urcdest.c
@@ -9,21 +9,6 @@ Author: 1987 Thomas L. Quarles
 
 
 void
-URCdestroy(GENmodel **inModel)
+URCdestroy(void)
 {
-    URCmodel *mod = *(URCmodel **) inModel;
-
-    while (mod) {
-        URCmodel *next_mod = URCnextModel(mod);
-        URCinstance *inst = URCinstances(mod);
-        while (inst) {
-            URCinstance *next_inst = URCnextInstance(inst);
-            URCdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        URCmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/urc/urcext.h b/src/spicelib/devices/urc/urcext.h
index e9a243005..52ce2cd72 100644
--- a/src/spicelib/devices/urc/urcext.h
+++ b/src/spicelib/devices/urc/urcext.h
@@ -7,7 +7,7 @@ Author: 1985 Thomas L. Quarles
 
 extern int URCask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int URCdelete(GENinstance*);
-extern void URCdestroy(GENmodel**);
+extern void URCdestroy(void);
 extern int URCmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
 extern int URCmDelete(GENmodel*);
 extern int URCmParam(int,IFvalue*,GENmodel*);
diff --git a/src/spicelib/devices/vbic/vbicdest.c b/src/spicelib/devices/vbic/vbicdest.c
index 44925f899..49938319e 100644
--- a/src/spicelib/devices/vbic/vbicdest.c
+++ b/src/spicelib/devices/vbic/vbicdest.c
@@ -16,21 +16,6 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH
 
 
 void
-VBICdestroy(GENmodel **inModel)
+VBICdestroy(void)
 {
-    VBICmodel *mod = *(VBICmodel**) inModel;
-
-    while (mod) {
-        VBICmodel *next_mod = VBICnextModel(mod);
-        VBICinstance *inst = VBICinstances(mod);
-        while (inst) {
-            VBICinstance *next_inst = VBICnextInstance(inst);
-            VBICdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        VBICmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/vbic/vbicext.h b/src/spicelib/devices/vbic/vbicext.h
index aa2937494..8a820d3dd 100644
--- a/src/spicelib/devices/vbic/vbicext.h
+++ b/src/spicelib/devices/vbic/vbicext.h
@@ -12,7 +12,7 @@ extern int VBICacLoad(GENmodel *,CKTcircuit*);
 extern int VBICask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int VBICconvTest(GENmodel*,CKTcircuit*);
 extern int VBICdelete(GENinstance*);
-extern void VBICdestroy(GENmodel**);
+extern void VBICdestroy(void);
 extern int VBICgetic(GENmodel*,CKTcircuit*);
 extern int VBICload(GENmodel*,CKTcircuit*);
 extern int VBICmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/vccs/vccsdest.c b/src/spicelib/devices/vccs/vccsdest.c
index 4427ea704..6115e2532 100644
--- a/src/spicelib/devices/vccs/vccsdest.c
+++ b/src/spicelib/devices/vccs/vccsdest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-VCCSdestroy(GENmodel **inModel)
+VCCSdestroy(void)
 {
-    VCCSmodel *mod = *(VCCSmodel**) inModel;
-
-    while (mod) {
-        VCCSmodel *next_mod = VCCSnextModel(mod);
-        VCCSinstance *inst = VCCSinstances(mod);
-        while (inst) {
-            VCCSinstance *next_inst = VCCSnextInstance(inst);
-            VCCSdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        VCCSmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/vccs/vccsext.h b/src/spicelib/devices/vccs/vccsext.h
index d59c753b0..8b6f2f2c6 100644
--- a/src/spicelib/devices/vccs/vccsext.h
+++ b/src/spicelib/devices/vccs/vccsext.h
@@ -5,7 +5,7 @@ Author: 1985 Thomas L. Quarles
 
 extern int VCCSask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int VCCSdelete(GENinstance*);
-extern void VCCSdestroy(GENmodel**);
+extern void VCCSdestroy(void);
 extern int VCCSload(GENmodel*,CKTcircuit*);
 extern int VCCSmDelete(GENmodel*);
 extern int VCCSparam(int,IFvalue*,GENinstance*,IFvalue*);
diff --git a/src/spicelib/devices/vcvs/vcvsdest.c b/src/spicelib/devices/vcvs/vcvsdest.c
index 3e0f5018d..c287fc948 100644
--- a/src/spicelib/devices/vcvs/vcvsdest.c
+++ b/src/spicelib/devices/vcvs/vcvsdest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-VCVSdestroy(GENmodel **inModel)
+VCVSdestroy(void)
 {
-    VCVSmodel *mod = *(VCVSmodel **) inModel;
-
-    while (mod) {
-        VCVSmodel *next_mod = VCVSnextModel(mod);
-        VCVSinstance *inst = VCVSinstances(mod);
-        while (inst) {
-            VCVSinstance *next_inst = VCVSnextInstance(inst);
-            VCVSdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        VCVSmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/vcvs/vcvsext.h b/src/spicelib/devices/vcvs/vcvsext.h
index 6edc7b1fd..a5ca450ad 100644
--- a/src/spicelib/devices/vcvs/vcvsext.h
+++ b/src/spicelib/devices/vcvs/vcvsext.h
@@ -5,7 +5,7 @@ Author: 1985 Thomas L. Quarles
 
 extern int VCVSask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int VCVSdelete(GENinstance*);
-extern void VCVSdestroy(GENmodel**);
+extern void VCVSdestroy(void);
 extern int VCVSfindBr(CKTcircuit*,GENmodel*,IFuid);
 extern int VCVSload(GENmodel*,CKTcircuit*);
 extern int VCVSmDelete(GENmodel*);
diff --git a/src/spicelib/devices/vsrc/vsrcdest.c b/src/spicelib/devices/vsrc/vsrcdest.c
index 33c83025d..561b7c8f9 100644
--- a/src/spicelib/devices/vsrc/vsrcdest.c
+++ b/src/spicelib/devices/vsrc/vsrcdest.c
@@ -9,21 +9,6 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-VSRCdestroy(GENmodel **inModel)
+VSRCdestroy(void)
 {
-    VSRCmodel *mod = *(VSRCmodel**) inModel;
-
-    while (mod) {
-        VSRCmodel *next_mod = VSRCnextModel(mod);
-        VSRCinstance *inst = VSRCinstances(mod);
-        while (inst) {
-            VSRCinstance *next_inst = VSRCnextInstance(inst);
-            VSRCdelete(GENinstanceOf(inst));
-            inst = next_inst;
-        }
-        VSRCmDelete(GENmodelOf(mod));
-        mod = next_mod;
-    }
-
-    *inModel = NULL;
 }
diff --git a/src/spicelib/devices/vsrc/vsrcext.h b/src/spicelib/devices/vsrc/vsrcext.h
index eb995fe6b..4e2ee8534 100644
--- a/src/spicelib/devices/vsrc/vsrcext.h
+++ b/src/spicelib/devices/vsrc/vsrcext.h
@@ -7,7 +7,7 @@ extern int VSRCaccept(CKTcircuit*,GENmodel*);
 extern int VSRCacLoad(GENmodel*,CKTcircuit*);
 extern int VSRCask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int VSRCdelete(GENinstance*);
-extern void VSRCdestroy(GENmodel**);
+extern void VSRCdestroy(void);
 extern int VSRCfindBr(CKTcircuit*,GENmodel*,IFuid);
 extern int VSRCload(GENmodel*,CKTcircuit*);
 extern int VSRCmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/xspice/icm/dlmain.c b/src/xspice/icm/dlmain.c
index 5791ebacb..0d3b75231 100644
--- a/src/xspice/icm/dlmain.c
+++ b/src/xspice/icm/dlmain.c
@@ -209,9 +209,9 @@ int MIFmDelete(
 }
 
 void MIFdestroy(
-    GENmodel **inModel
+    void
 	) {
-	(coreitf->dllitf_MIFdestroy)(inModel);
+	(coreitf->dllitf_MIFdestroy)();
 }
 
 char  *MIFgettok(
diff --git a/src/xspice/mif/mifdestr.c b/src/xspice/mif/mifdestr.c
index bf2047b82..0a197aec3 100644
--- a/src/xspice/mif/mifdestr.c
+++ b/src/xspice/mif/mifdestr.c
@@ -49,24 +49,8 @@ NON-STANDARD FEATURES
 
 /*
 MIFdestroy
-
-This function deletes all models and all instances of a specified
-device type.  It traverses the linked list of model structures
-for that type and calls MIFmDelete on each model.
 */
 
-void MIFdestroy(
-    GENmodel **inModel)    /* The head of the list of models to delete */
+void MIFdestroy(void)
 {
-
-    /* Free all models of this device type by removing */
-    /* models from the head of the linked list until   */
-    /* the head is null */
-
-    while(*inModel) {
-        GENmodel *next_model = (*inModel)->GENnextModel;
-        MIFmDelete(*inModel);
-        *inModel = next_model;
-    }
-
 }