diff --git a/src/spicelib/devices/asrc/asrcdel.c b/src/spicelib/devices/asrc/asrcdel.c
index 15e832982..616f6b382 100644
--- a/src/spicelib/devices/asrc/asrcdel.c
+++ b/src/spicelib/devices/asrc/asrcdel.c
@@ -10,24 +10,8 @@ Author: 1987 Kanwar Jit Singh
 
 
 int
-ASRCdelete(GENmodel *model, IFuid name, GENinstance **fast)
+ASRCdelete(GENinstance *gen_inst)
 {
-    ASRCinstance **instPtr = (ASRCinstance **) fast;
-    ASRCmodel *modPtr = (ASRCmodel *) model;
-    ASRCinstance **prev = NULL;
-    ASRCinstance *here;
-
-    for (; modPtr; modPtr = modPtr->ASRCnextModel) {
-        prev = &(modPtr->ASRCinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->ASRCname == name || (instPtr && here == *instPtr)) {
-                *prev = here->ASRCnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->ASRCnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/asrc/asrcext.h b/src/spicelib/devices/asrc/asrcext.h
index 14218c685..27a15b5d4 100644
--- a/src/spicelib/devices/asrc/asrcext.h
+++ b/src/spicelib/devices/asrc/asrcext.h
@@ -5,7 +5,7 @@ Author: 1985 Thomas L. Quarles
 
 extern int ASRCask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue*);
 extern int ASRCconvTest(GENmodel *, CKTcircuit *);
-extern int ASRCdelete(GENmodel *, IFuid, GENinstance **);
+extern int ASRCdelete(GENinstance *);
 extern void ASRCdestroy(GENmodel **);
 extern int ASRCfindBr(CKTcircuit *, GENmodel *, IFuid);
 extern int ASRCload(GENmodel *, CKTcircuit *);
diff --git a/src/spicelib/devices/bjt/bjtdel.c b/src/spicelib/devices/bjt/bjtdel.c
index c83341795..4958fda27 100644
--- a/src/spicelib/devices/bjt/bjtdel.c
+++ b/src/spicelib/devices/bjt/bjtdel.c
@@ -15,24 +15,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-BJTdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
+BJTdelete(GENinstance *gen_inst)
 {
-    BJTmodel *model = (BJTmodel *) inModel;
-    BJTinstance **fast = (BJTinstance **) kill;
-    BJTinstance **prev = NULL;
-    BJTinstance *here;
-
-    for (; model; model = model->BJTnextModel) {
-        prev = &(model->BJTinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->BJTname == name || (fast && here == *fast)) {
-                *prev = here->BJTnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->BJTnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bjt/bjtext.h b/src/spicelib/devices/bjt/bjtext.h
index 16655610f..29b30859f 100644
--- a/src/spicelib/devices/bjt/bjtext.h
+++ b/src/spicelib/devices/bjt/bjtext.h
@@ -10,7 +10,7 @@ Modified: 2000 AlansFixes
 extern int BJTacLoad(GENmodel *,CKTcircuit*);
 extern int BJTask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BJTconvTest(GENmodel*,CKTcircuit*);
-extern int BJTdelete(GENmodel*,IFuid,GENinstance**);
+extern int BJTdelete(GENinstance*);
 extern void BJTdestroy(GENmodel**);
 extern int BJTgetic(GENmodel*,CKTcircuit*);
 extern int BJTload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsim1/b1del.c b/src/spicelib/devices/bsim1/b1del.c
index 1c54f6155..53f4e57d1 100644
--- a/src/spicelib/devices/bsim1/b1del.c
+++ b/src/spicelib/devices/bsim1/b1del.c
@@ -11,24 +11,8 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
 
 
 int
-B1delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+B1delete(GENinstance *gen_inst)
 {
-    B1instance **fast = (B1instance **) inInst;
-    B1model *model = (B1model *) inModel;
-    B1instance **prev = NULL;
-    B1instance *here;
-
-    for (; model; model = model->B1nextModel) {
-        prev = &(model->B1instances);
-        for (here = *prev; here; here = *prev) {
-            if (here->B1name == name || (fast && here == *fast)) {
-                *prev = here->B1nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->B1nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim1/bsim1ext.h b/src/spicelib/devices/bsim1/bsim1ext.h
index e859e3009..ffe891703 100644
--- a/src/spicelib/devices/bsim1/bsim1ext.h
+++ b/src/spicelib/devices/bsim1/bsim1ext.h
@@ -8,7 +8,7 @@ Modified: 2000 AlansFixes
 extern int B1acLoad(GENmodel *,CKTcircuit*);
 extern int B1ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int B1convTest(GENmodel *,CKTcircuit*);
-extern int B1delete(GENmodel*,IFuid,GENinstance**);
+extern int B1delete(GENinstance*);
 extern void B1destroy(GENmodel**);
 extern int B1getic(GENmodel*,CKTcircuit*);
 extern int B1load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsim2/b2del.c b/src/spicelib/devices/bsim2/b2del.c
index 38c77d17d..9eb62f373 100644
--- a/src/spicelib/devices/bsim2/b2del.c
+++ b/src/spicelib/devices/bsim2/b2del.c
@@ -11,24 +11,8 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
 
 
 int
-B2delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+B2delete(GENinstance *gen_inst)
 {
-    B2instance **fast = (B2instance **) inInst;
-    B2model *model = (B2model *) inModel;
-    B2instance **prev = NULL;
-    B2instance *here;
-
-    for (; model; model = model->B2nextModel) {
-        prev = &(model->B2instances);
-        for (here = *prev; here; here = *prev) {
-            if (here->B2name == name || (fast && here == *fast)) {
-                *prev = here->B2nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->B2nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim2/bsim2ext.h b/src/spicelib/devices/bsim2/bsim2ext.h
index ab7b800da..cf88f9758 100644
--- a/src/spicelib/devices/bsim2/bsim2ext.h
+++ b/src/spicelib/devices/bsim2/bsim2ext.h
@@ -6,7 +6,7 @@ Author: 1988 Min-Chie Jeng, Hong June Park, Thomas L. Quarles
 extern int B2acLoad(GENmodel *,CKTcircuit*);
 extern int B2ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int B2convTest(GENmodel *,CKTcircuit*);
-extern int B2delete(GENmodel*,IFuid,GENinstance**);
+extern int B2delete(GENinstance*);
 extern void B2destroy(GENmodel**);
 extern int B2getic(GENmodel*,CKTcircuit*);
 extern int B2load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsim3/b3del.c b/src/spicelib/devices/bsim3/b3del.c
index 51d967849..780c0c8a4 100644
--- a/src/spicelib/devices/bsim3/b3del.c
+++ b/src/spicelib/devices/bsim3/b3del.c
@@ -17,27 +17,8 @@
 
 
 int
-BSIM3delete(
-            GENmodel *inModel,
-            IFuid name,
-            GENinstance **inInst)
+BSIM3delete(GENinstance *gen_inst)
 {
-    BSIM3instance **fast = (BSIM3instance **) inInst;
-    BSIM3model *model = (BSIM3model *) inModel;
-    BSIM3instance **prev = NULL;
-    BSIM3instance *here;
-
-    for (; model; model = model->BSIM3nextModel)
-    {   prev = &(model->BSIM3instances);
-        for (here = *prev; here; here = *prev)
-        {   if (here->BSIM3name == name || (fast && here == *fast))
-            {   *prev = here->BSIM3nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->BSIM3nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim3/bsim3ext.h b/src/spicelib/devices/bsim3/bsim3ext.h
index 2282a6d37..9c7df5bbf 100644
--- a/src/spicelib/devices/bsim3/bsim3ext.h
+++ b/src/spicelib/devices/bsim3/bsim3ext.h
@@ -8,7 +8,7 @@ File: bsim3ext.h
 extern int BSIM3acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM3ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM3convTest(GENmodel *,CKTcircuit*);
-extern int BSIM3delete(GENmodel*,IFuid,GENinstance**);
+extern int BSIM3delete(GENinstance*);
 extern void BSIM3destroy(GENmodel**);
 extern int BSIM3getic(GENmodel*,CKTcircuit*);
 extern int BSIM3load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soidddel.c b/src/spicelib/devices/bsim3soi_dd/b3soidddel.c
index c2a2c57b9..2608d2fcb 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soidddel.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soidddel.c
@@ -18,24 +18,8 @@ Modified by Paolo Nenzi 2002
 
 
 int
-B3SOIDDdelete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+B3SOIDDdelete(GENinstance *gen_inst)
 {
-    B3SOIDDinstance **fast = (B3SOIDDinstance **) inInst;
-    B3SOIDDmodel *model = (B3SOIDDmodel *) inModel;
-    B3SOIDDinstance **prev = NULL;
-    B3SOIDDinstance *here;
-
-    for (; model; model = model->B3SOIDDnextModel)
-    {   prev = &(model->B3SOIDDinstances);
-        for (here = *prev; here; here = *prev)
-        {   if (here->B3SOIDDname == name || (fast && here == *fast))
-            {   *prev = here->B3SOIDDnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->B3SOIDDnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddext.h b/src/spicelib/devices/bsim3soi_dd/b3soiddext.h
index 1d5d90695..45504ba43 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddext.h
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddext.h
@@ -8,7 +8,7 @@ Modifed by Paolo Nenzi 2002
 extern int B3SOIDDacLoad(GENmodel *,CKTcircuit*);
 extern int B3SOIDDask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int B3SOIDDconvTest(GENmodel *,CKTcircuit*);
-extern int B3SOIDDdelete(GENmodel*,IFuid,GENinstance**);
+extern int B3SOIDDdelete(GENinstance*);
 extern void B3SOIDDdestroy(GENmodel**);
 extern int B3SOIDDgetic(GENmodel*,CKTcircuit*);
 extern int B3SOIDDload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifddel.c b/src/spicelib/devices/bsim3soi_fd/b3soifddel.c
index c634bf68d..1faf4c3c3 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifddel.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifddel.c
@@ -18,24 +18,8 @@ File: b3soifddel.c          98/5/01
 
 
 int
-B3SOIFDdelete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+B3SOIFDdelete(GENinstance *gen_inst)
 {
-    B3SOIFDinstance **fast = (B3SOIFDinstance **) inInst;
-    B3SOIFDmodel *model = (B3SOIFDmodel *) inModel;
-    B3SOIFDinstance **prev = NULL;
-    B3SOIFDinstance *here;
-
-    for (; model; model = model->B3SOIFDnextModel)
-    {   prev = &(model->B3SOIFDinstances);
-        for (here = *prev; here; here = *prev)
-        {   if (here->B3SOIFDname == name || (fast && here == *fast))
-            {   *prev = here->B3SOIFDnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->B3SOIFDnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdext.h b/src/spicelib/devices/bsim3soi_fd/b3soifdext.h
index 1c6ed33dd..4c4308640 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdext.h
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdext.h
@@ -8,7 +8,7 @@ File: b3soifdext.h
 extern int B3SOIFDacLoad(GENmodel *,CKTcircuit*);
 extern int B3SOIFDask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int B3SOIFDconvTest(GENmodel *,CKTcircuit*);
-extern int B3SOIFDdelete(GENmodel*,IFuid,GENinstance**);
+extern int B3SOIFDdelete(GENinstance*);
 extern void B3SOIFDdestroy(GENmodel**);
 extern int B3SOIFDgetic(GENmodel*,CKTcircuit*);
 extern int B3SOIFDload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipddel.c b/src/spicelib/devices/bsim3soi_pd/b3soipddel.c
index 57262b43e..97b4fb4f4 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipddel.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipddel.c
@@ -18,24 +18,8 @@ Modified by Paolo Nenzi 2002
 
 
 int
-B3SOIPDdelete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+B3SOIPDdelete(GENinstance *gen_inst)
 {
-    B3SOIPDinstance **fast = (B3SOIPDinstance **) inInst;
-    B3SOIPDmodel *model = (B3SOIPDmodel *) inModel;
-    B3SOIPDinstance **prev = NULL;
-    B3SOIPDinstance *here;
-
-    for (; model; model = model->B3SOIPDnextModel)
-    {   prev = &(model->B3SOIPDinstances);
-        for (here = *prev; here; here = *prev)
-        {   if (here->B3SOIPDname == name || (fast && here == *fast))
-            {   *prev = here->B3SOIPDnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->B3SOIPDnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdext.h b/src/spicelib/devices/bsim3soi_pd/b3soipdext.h
index ea2951794..a2ebdedd7 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdext.h
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdext.h
@@ -8,7 +8,7 @@ Modified by Paolo Nenzi 2002
 extern int B3SOIPDacLoad(GENmodel *,CKTcircuit*);
 extern int B3SOIPDask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int B3SOIPDconvTest(GENmodel *,CKTcircuit*);
-extern int B3SOIPDdelete(GENmodel*,IFuid,GENinstance**);
+extern int B3SOIPDdelete(GENinstance*);
 extern void B3SOIPDdestroy(GENmodel**);
 extern int B3SOIPDgetic(GENmodel*,CKTcircuit*);
 extern int B3SOIPDload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsim3v0/b3v0del.c b/src/spicelib/devices/bsim3v0/b3v0del.c
index dad98fc81..ca91728c8 100644
--- a/src/spicelib/devices/bsim3v0/b3v0del.c
+++ b/src/spicelib/devices/bsim3v0/b3v0del.c
@@ -12,24 +12,8 @@ File: b3v0del.c
 
 
 int
-BSIM3v0delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+BSIM3v0delete(GENinstance *gen_inst)
 {
-    BSIM3v0instance **fast = (BSIM3v0instance **) inInst;
-    BSIM3v0model *model = (BSIM3v0model *) inModel;
-    BSIM3v0instance **prev = NULL;
-    BSIM3v0instance *here;
-
-    for (; model; model = model->BSIM3v0nextModel)
-    {   prev = &(model->BSIM3v0instances);
-        for (here = *prev; here; here = *prev)
-        {   if (here->BSIM3v0name == name || (fast && here == *fast))
-            {   *prev = here->BSIM3v0nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->BSIM3v0nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim3v0/bsim3v0ext.h b/src/spicelib/devices/bsim3v0/bsim3v0ext.h
index 02ad75173..85715c7c4 100644
--- a/src/spicelib/devices/bsim3v0/bsim3v0ext.h
+++ b/src/spicelib/devices/bsim3v0/bsim3v0ext.h
@@ -7,7 +7,7 @@ File: bsim3v0ext.h
 extern int BSIM3v0acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM3v0ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM3v0convTest(GENmodel *,CKTcircuit*);
-extern int BSIM3v0delete(GENmodel*,IFuid,GENinstance**);
+extern int BSIM3v0delete(GENinstance*);
 extern void BSIM3v0destroy(GENmodel**);
 extern int BSIM3v0getic(GENmodel*,CKTcircuit*);
 extern int BSIM3v0load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsim3v1/b3v1del.c b/src/spicelib/devices/bsim3v1/b3v1del.c
index daabd7dbe..1f8486b0d 100644
--- a/src/spicelib/devices/bsim3v1/b3v1del.c
+++ b/src/spicelib/devices/bsim3v1/b3v1del.c
@@ -18,24 +18,8 @@
 
 
 int
-BSIM3v1delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+BSIM3v1delete(GENinstance *gen_inst)
 {
-    BSIM3v1instance **fast = (BSIM3v1instance **) inInst;
-    BSIM3v1model *model = (BSIM3v1model *) inModel;
-    BSIM3v1instance **prev = NULL;
-    BSIM3v1instance *here;
-
-    for (; model; model = model->BSIM3v1nextModel)
-    {   prev = &(model->BSIM3v1instances);
-        for (here = *prev; here; here = *prev)
-        {   if (here->BSIM3v1name == name || (fast && here == *fast))
-            {   *prev = here->BSIM3v1nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->BSIM3v1nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim3v1/bsim3v1ext.h b/src/spicelib/devices/bsim3v1/bsim3v1ext.h
index 67c96c37e..7479b4ee5 100644
--- a/src/spicelib/devices/bsim3v1/bsim3v1ext.h
+++ b/src/spicelib/devices/bsim3v1/bsim3v1ext.h
@@ -8,7 +8,7 @@ File: bsim3v1ext.h
 extern int BSIM3v1acLoad(GENmodel *, CKTcircuit *);
 extern int BSIM3v1ask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
 extern int BSIM3v1convTest(GENmodel *, CKTcircuit *);
-extern int BSIM3v1delete(GENmodel *, IFuid, GENinstance **);
+extern int BSIM3v1delete(GENinstance *);
 extern void BSIM3v1destroy(GENmodel **);
 extern int BSIM3v1getic(GENmodel *, CKTcircuit *);
 extern int BSIM3v1load(GENmodel *, CKTcircuit *);
diff --git a/src/spicelib/devices/bsim3v32/b3v32del.c b/src/spicelib/devices/bsim3v32/b3v32del.c
index 8e9c2aee9..ccbcd7d58 100644
--- a/src/spicelib/devices/bsim3v32/b3v32del.c
+++ b/src/spicelib/devices/bsim3v32/b3v32del.c
@@ -18,24 +18,8 @@
 
 
 int
-BSIM3v32delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+BSIM3v32delete(GENinstance *gen_inst)
 {
-    BSIM3v32instance **fast = (BSIM3v32instance **) inInst;
-    BSIM3v32model *model = (BSIM3v32model *) inModel;
-    BSIM3v32instance **prev = NULL;
-    BSIM3v32instance *here;
-
-    for (; model; model = model->BSIM3v32nextModel)
-    {   prev = &(model->BSIM3v32instances);
-        for (here = *prev; here; here = *prev)
-        {   if (here->BSIM3v32name == name || (fast && here == *fast))
-            {   *prev = here->BSIM3v32nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->BSIM3v32nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim3v32/bsim3v32ext.h b/src/spicelib/devices/bsim3v32/bsim3v32ext.h
index 64ff43ccf..a04fb6778 100644
--- a/src/spicelib/devices/bsim3v32/bsim3v32ext.h
+++ b/src/spicelib/devices/bsim3v32/bsim3v32ext.h
@@ -9,7 +9,7 @@ File: bsim3ext.h
 extern int BSIM3v32acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM3v32ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM3v32convTest(GENmodel *,CKTcircuit*);
-extern int BSIM3v32delete(GENmodel*,IFuid,GENinstance**);
+extern int BSIM3v32delete(GENinstance*);
 extern void BSIM3v32destroy(GENmodel**);
 extern int BSIM3v32getic(GENmodel*,CKTcircuit*);
 extern int BSIM3v32load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsim4/b4del.c b/src/spicelib/devices/bsim4/b4del.c
index 3f575f7b1..a72953039 100644
--- a/src/spicelib/devices/bsim4/b4del.c
+++ b/src/spicelib/devices/bsim4/b4del.c
@@ -66,27 +66,8 @@
 
 
 int
-BSIM4delete(
-            GENmodel *inModel,
-            IFuid name,
-            GENinstance **inInst)
+BSIM4delete(GENinstance *gen_inst)
 {
-    BSIM4instance **fast = (BSIM4instance **) inInst;
-    BSIM4model *model = (BSIM4model *) inModel;
-    BSIM4instance **prev = NULL;
-    BSIM4instance *here;
-
-    for (; model; model = model->BSIM4nextModel)
-    {   prev = &(model->BSIM4instances);
-        for (here = *prev; here; here = *prev)
-        {   if (here->BSIM4name == name || (fast && here == *fast))
-            {   *prev = here->BSIM4nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->BSIM4nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim4/bsim4ext.h b/src/spicelib/devices/bsim4/bsim4ext.h
index 3a4b32728..4786dd2f9 100644
--- a/src/spicelib/devices/bsim4/bsim4ext.h
+++ b/src/spicelib/devices/bsim4/bsim4ext.h
@@ -61,7 +61,7 @@
 extern int BSIM4acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM4ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM4convTest(GENmodel *,CKTcircuit*);
-extern int BSIM4delete(GENmodel*,IFuid,GENinstance**);
+extern int BSIM4delete(GENinstance*);
 extern void BSIM4destroy(GENmodel**);
 extern int BSIM4getic(GENmodel*,CKTcircuit*);
 extern int BSIM4load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsim4v5/b4v5del.c b/src/spicelib/devices/bsim4v5/b4v5del.c
index 878791d2b..13624afee 100644
--- a/src/spicelib/devices/bsim4v5/b4v5del.c
+++ b/src/spicelib/devices/bsim4v5/b4v5del.c
@@ -16,27 +16,8 @@
 
 
 int
-BSIM4v5delete(
-              GENmodel *inModel,
-              IFuid name,
-              GENinstance **inInst)
+BSIM4v5delete(GENinstance *gen_inst)
 {
-    BSIM4v5instance **fast = (BSIM4v5instance **) inInst;
-    BSIM4v5model *model = (BSIM4v5model *) inModel;
-    BSIM4v5instance **prev = NULL;
-    BSIM4v5instance *here;
-
-    for (; model; model = model->BSIM4v5nextModel)
-    {   prev = &(model->BSIM4v5instances);
-        for (here = *prev; here; here = *prev)
-        {   if (here->BSIM4v5name == name || (fast && here == *fast))
-            {   *prev = here->BSIM4v5nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->BSIM4v5nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim4v5/bsim4v5ext.h b/src/spicelib/devices/bsim4v5/bsim4v5ext.h
index d4b72da68..b906984d4 100644
--- a/src/spicelib/devices/bsim4v5/bsim4v5ext.h
+++ b/src/spicelib/devices/bsim4v5/bsim4v5ext.h
@@ -8,7 +8,7 @@ File: bsim4v5ext.h
 extern int BSIM4v5acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM4v5ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM4v5convTest(GENmodel *,CKTcircuit*);
-extern int BSIM4v5delete(GENmodel*,IFuid,GENinstance**);
+extern int BSIM4v5delete(GENinstance*);
 extern void BSIM4v5destroy(GENmodel**);
 extern int BSIM4v5getic(GENmodel*,CKTcircuit*);
 extern int BSIM4v5load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsim4v6/b4v6del.c b/src/spicelib/devices/bsim4v6/b4v6del.c
index 272b9e667..a165c5783 100644
--- a/src/spicelib/devices/bsim4v6/b4v6del.c
+++ b/src/spicelib/devices/bsim4v6/b4v6del.c
@@ -18,27 +18,8 @@
 
 
 int
-BSIM4v6delete(
-              GENmodel *inModel,
-              IFuid name,
-              GENinstance **inInst)
+BSIM4v6delete(GENinstance *gen_inst)
 {
-    BSIM4v6instance **fast = (BSIM4v6instance **) inInst;
-    BSIM4v6model *model = (BSIM4v6model *) inModel;
-    BSIM4v6instance **prev = NULL;
-    BSIM4v6instance *here;
-
-    for (; model; model = model->BSIM4v6nextModel)
-    {   prev = &(model->BSIM4v6instances);
-        for (here = *prev; here; here = *prev)
-        {   if (here->BSIM4v6name == name || (fast && here == *fast))
-            {   *prev = here->BSIM4v6nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->BSIM4v6nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim4v6/bsim4v6ext.h b/src/spicelib/devices/bsim4v6/bsim4v6ext.h
index c08a6b9b9..e2a20db49 100644
--- a/src/spicelib/devices/bsim4v6/bsim4v6ext.h
+++ b/src/spicelib/devices/bsim4v6/bsim4v6ext.h
@@ -8,7 +8,7 @@ File: bsim4v6ext.h
 extern int BSIM4v6acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM4v6ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM4v6convTest(GENmodel *,CKTcircuit*);
-extern int BSIM4v6delete(GENmodel*,IFuid,GENinstance**);
+extern int BSIM4v6delete(GENinstance*);
 extern void BSIM4v6destroy(GENmodel**);
 extern int BSIM4v6getic(GENmodel*,CKTcircuit*);
 extern int BSIM4v6load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsim4v7/b4v7del.c b/src/spicelib/devices/bsim4v7/b4v7del.c
index 3b16a7c6a..c3cf9d529 100644
--- a/src/spicelib/devices/bsim4v7/b4v7del.c
+++ b/src/spicelib/devices/bsim4v7/b4v7del.c
@@ -18,27 +18,8 @@
 
 
 int
-BSIM4v7delete(
-              GENmodel *inModel,
-              IFuid name,
-              GENinstance **inInst)
+BSIM4v7delete(GENinstance *gen_inst)
 {
-    BSIM4v7instance **fast = (BSIM4v7instance **) inInst;
-    BSIM4v7model *model = (BSIM4v7model *) inModel;
-    BSIM4v7instance **prev = NULL;
-    BSIM4v7instance *here;
-
-    for (; model; model = model->BSIM4v7nextModel)
-    {   prev = &(model->BSIM4v7instances);
-        for (here = *prev; here; here = *prev)
-        {   if (here->BSIM4v7name == name || (fast && here == *fast))
-            {   *prev = here->BSIM4v7nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->BSIM4v7nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsim4v7/bsim4v7ext.h b/src/spicelib/devices/bsim4v7/bsim4v7ext.h
index e6e863087..93919858f 100644
--- a/src/spicelib/devices/bsim4v7/bsim4v7ext.h
+++ b/src/spicelib/devices/bsim4v7/bsim4v7ext.h
@@ -8,7 +8,7 @@ File: bsim4v7ext.h
 extern int BSIM4v7acLoad(GENmodel *,CKTcircuit*);
 extern int BSIM4v7ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int BSIM4v7convTest(GENmodel *,CKTcircuit*);
-extern int BSIM4v7delete(GENmodel*,IFuid,GENinstance**);
+extern int BSIM4v7delete(GENinstance*);
 extern void BSIM4v7destroy(GENmodel**);
 extern int BSIM4v7getic(GENmodel*,CKTcircuit*);
 extern int BSIM4v7load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/bsimsoi/b4soidel.c b/src/spicelib/devices/bsimsoi/b4soidel.c
index a2f216a81..73bc29d14 100644
--- a/src/spicelib/devices/bsimsoi/b4soidel.c
+++ b/src/spicelib/devices/bsimsoi/b4soidel.c
@@ -21,27 +21,8 @@
 
 
 int
-B4SOIdelete(
-            GENmodel *inModel,
-            IFuid name,
-            GENinstance **inInst)
+B4SOIdelete(GENinstance *gen_inst)
 {
-    B4SOIinstance **fast = (B4SOIinstance **) inInst;
-    B4SOImodel *model = (B4SOImodel *) inModel;
-    B4SOIinstance **prev = NULL;
-    B4SOIinstance *here;
-
-    for (; model; model = model->B4SOInextModel)
-    {   prev = &(model->B4SOIinstances);
-        for (here = *prev; here; here = *prev)
-        {   if (here->B4SOIname == name || (fast && here == *fast))
-            {   *prev = here->B4SOInextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->B4SOInextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/bsimsoi/b4soiext.h b/src/spicelib/devices/bsimsoi/b4soiext.h
index bb252b941..b2133c266 100644
--- a/src/spicelib/devices/bsimsoi/b4soiext.h
+++ b/src/spicelib/devices/bsimsoi/b4soiext.h
@@ -10,7 +10,7 @@ File: b4soiext.h
 extern int B4SOIacLoad(GENmodel *,CKTcircuit*);
 extern int B4SOIask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int B4SOIconvTest(GENmodel *,CKTcircuit*);
-extern int B4SOIdelete(GENmodel*,IFuid,GENinstance**);
+extern int B4SOIdelete(GENinstance*);
 extern void B4SOIdestroy(GENmodel**);
 extern int B4SOIgetic(GENmodel*,CKTcircuit*);
 extern int B4SOIload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/cap/capdel.c b/src/spicelib/devices/cap/capdel.c
index 536599425..20d5187c2 100644
--- a/src/spicelib/devices/cap/capdel.c
+++ b/src/spicelib/devices/cap/capdel.c
@@ -11,24 +11,8 @@ Modified: September 2003 Paolo Nenzi
 
 
 int
-CAPdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+CAPdelete(GENinstance *gen_inst)
 {
-    CAPinstance **fast = (CAPinstance **) inst;
-    CAPmodel *model = (CAPmodel *) inModel;
-    CAPinstance **prev = NULL;
-    CAPinstance *here;
-
-    for (; model; model = model->CAPnextModel) {
-        prev = &(model->CAPinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->CAPname == name || (fast && here == *fast)) {
-                *prev = here->CAPnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->CAPnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/cap/capext.h b/src/spicelib/devices/cap/capext.h
index d128959c4..e42b8dc31 100644
--- a/src/spicelib/devices/cap/capext.h
+++ b/src/spicelib/devices/cap/capext.h
@@ -5,7 +5,7 @@ Author: 1985 Thomas L. Quarles
 
 extern int CAPacLoad(GENmodel*,CKTcircuit*);
 extern int CAPask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int CAPdelete(GENmodel*,IFuid,GENinstance**);
+extern int CAPdelete(GENinstance*);
 extern void CAPdestroy(GENmodel**);
 extern int CAPgetic(GENmodel*,CKTcircuit*);
 extern int CAPload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/cccs/cccsdel.c b/src/spicelib/devices/cccs/cccsdel.c
index 8092c97b2..2af308407 100644
--- a/src/spicelib/devices/cccs/cccsdel.c
+++ b/src/spicelib/devices/cccs/cccsdel.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CCCSdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+CCCSdelete(GENinstance *gen_inst)
 {
-    CCCSmodel *model = (CCCSmodel *) inModel;
-    CCCSinstance **fast = (CCCSinstance **) inst;
-    CCCSinstance **prev = NULL;
-    CCCSinstance *here;
-
-    for (; model; model = model->CCCSnextModel) {
-        prev = &(model->CCCSinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->CCCSname == name || (fast && here == *fast)) {
-                *prev = here->CCCSnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->CCCSnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/cccs/cccsext.h b/src/spicelib/devices/cccs/cccsext.h
index 5a8934518..162ad9d61 100644
--- a/src/spicelib/devices/cccs/cccsext.h
+++ b/src/spicelib/devices/cccs/cccsext.h
@@ -5,7 +5,7 @@ Author: 1985 Thomas L. Quarles
 
 
 extern int CCCSask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int CCCSdelete(GENmodel*,IFuid,GENinstance**);
+extern int CCCSdelete(GENinstance*);
 extern void CCCSdestroy(GENmodel**);
 extern int CCCSload(GENmodel*,CKTcircuit*);
 extern int CCCSmDelete(GENmodel**,IFuid,GENmodel*);
diff --git a/src/spicelib/devices/ccvs/ccvsdel.c b/src/spicelib/devices/ccvs/ccvsdel.c
index f167a5504..7f5dba9fe 100644
--- a/src/spicelib/devices/ccvs/ccvsdel.c
+++ b/src/spicelib/devices/ccvs/ccvsdel.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CCVSdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
+CCVSdelete(GENinstance *gen_inst)
 {
-    CCVSmodel *model = (CCVSmodel *) inModel;
-    CCVSinstance **fast = (CCVSinstance **) kill;
-    CCVSinstance **prev = NULL;
-    CCVSinstance *here;
-
-    for (; model; model = model->CCVSnextModel) {
-        prev = &(model->CCVSinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->CCVSname == name || (fast && here == *fast)) {
-                *prev = here->CCVSnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->CCVSnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/ccvs/ccvsext.h b/src/spicelib/devices/ccvs/ccvsext.h
index 779cdd225..bb6ba2e4c 100644
--- a/src/spicelib/devices/ccvs/ccvsext.h
+++ b/src/spicelib/devices/ccvs/ccvsext.h
@@ -4,7 +4,7 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 extern int CCVSask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int CCVSdelete(GENmodel*,IFuid,GENinstance**);
+extern int CCVSdelete(GENinstance*);
 extern void CCVSdestroy(GENmodel**);
 extern int CCVSfindBr(CKTcircuit*,GENmodel*,IFuid);
 extern int CCVSload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/cpl/cpldel.c b/src/spicelib/devices/cpl/cpldel.c
index c8b7a4d68..ebb192cc8 100644
--- a/src/spicelib/devices/cpl/cpldel.c
+++ b/src/spicelib/devices/cpl/cpldel.c
@@ -11,24 +11,8 @@ Author: 1992 Charles Hough
 
 
 int
-CPLdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+CPLdelete(GENinstance *gen_inst)
 {
-    CPLmodel *model = (CPLmodel *) inModel;
-    CPLinstance **fast = (CPLinstance **) inst;
-    CPLinstance **prev = NULL;
-    CPLinstance *here;
-
-    for (; model; model = model->CPLnextModel) {
-        prev = &(model->CPLinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->CPLname == name || (fast && here == *fast)) {
-                *prev = here->CPLnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->CPLnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/cpl/cplext.h b/src/spicelib/devices/cpl/cplext.h
index 1f2930cf9..16db90c93 100644
--- a/src/spicelib/devices/cpl/cplext.h
+++ b/src/spicelib/devices/cpl/cplext.h
@@ -5,7 +5,7 @@ reserved.
 
 /* extern int CPLaccept(CKTcircuit*, GENmodel*); */
 extern int CPLask(CKTcircuit*, GENinstance*, int, IFvalue*, IFvalue*);
-extern int CPLdelete(GENmodel*, IFuid,GENinstance**);
+extern int CPLdelete(GENinstance*);
 extern void CPLdestroy(GENmodel**);
 extern int CPLload(GENmodel*, CKTcircuit*);
 extern int CPLmAsk(CKTcircuit*, GENmodel*, int, IFvalue*);
diff --git a/src/spicelib/devices/csw/cswdel.c b/src/spicelib/devices/csw/cswdel.c
index 038d896eb..f83042b0c 100644
--- a/src/spicelib/devices/csw/cswdel.c
+++ b/src/spicelib/devices/csw/cswdel.c
@@ -10,24 +10,8 @@ Author: 1985 Gordon Jacobs
 
 
 int
-CSWdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+CSWdelete(GENinstance *gen_inst)
 {
-    CSWmodel *model = (CSWmodel *) inModel;
-    CSWinstance **fast = (CSWinstance **) inst;
-    CSWinstance **prev = NULL;
-    CSWinstance *here;
-
-    for (; model; model = model->CSWnextModel) {
-        prev = &(model->CSWinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->CSWname == name || (fast && here == *fast)) {
-                *prev = here->CSWnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->CSWnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/csw/cswext.h b/src/spicelib/devices/csw/cswext.h
index daf6dbc11..25307d9cd 100644
--- a/src/spicelib/devices/csw/cswext.h
+++ b/src/spicelib/devices/csw/cswext.h
@@ -6,7 +6,7 @@ Modified: 2000 AlansFixes
 
 extern int CSWask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int CSWacLoad(GENmodel*,CKTcircuit*);
-extern int CSWdelete(GENmodel*,IFuid,GENinstance**);
+extern int CSWdelete(GENinstance*);
 extern void CSWdestroy(GENmodel**);
 extern int CSWload(GENmodel*,CKTcircuit*);
 extern int CSWmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/dio/diodel.c b/src/spicelib/devices/dio/diodel.c
index 403453cb1..55e81749a 100644
--- a/src/spicelib/devices/dio/diodel.c
+++ b/src/spicelib/devices/dio/diodel.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-DIOdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
+DIOdelete(GENinstance *gen_inst)
 {
-    DIOmodel *model = (DIOmodel *) inModel;
-    DIOinstance **fast = (DIOinstance **) kill;
-    DIOinstance **prev = NULL;
-    DIOinstance *here;
-
-    for (; model; model = model->DIOnextModel) {
-        prev = &(model->DIOinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->DIOname == name || (fast && here == *fast)) {
-                *prev = here->DIOnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->DIOnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/dio/dioext.h b/src/spicelib/devices/dio/dioext.h
index 803efea33..c929e89bc 100644
--- a/src/spicelib/devices/dio/dioext.h
+++ b/src/spicelib/devices/dio/dioext.h
@@ -7,7 +7,7 @@ Modified: 2000 AlansFixes
 extern int DIOacLoad(GENmodel*,CKTcircuit*);
 extern int DIOask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int DIOconvTest(GENmodel *,CKTcircuit*);
-extern int DIOdelete(GENmodel*,IFuid,GENinstance**);
+extern int DIOdelete(GENinstance*);
 extern void DIOdestroy(GENmodel**);
 extern int DIOgetic(GENmodel*,CKTcircuit*);
 extern int DIOload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/hfet1/hfetdel.c b/src/spicelib/devices/hfet1/hfetdel.c
index bb7cdea68..ca46fe582 100644
--- a/src/spicelib/devices/hfet1/hfetdel.c
+++ b/src/spicelib/devices/hfet1/hfetdel.c
@@ -14,24 +14,8 @@ Author: 1985 S. Hwang
 
 
 int
-HFETAdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+HFETAdelete(GENinstance *gen_inst)
 {
-    HFETAmodel *model = (HFETAmodel *) inModel;
-    HFETAinstance **fast = (HFETAinstance **) inst;
-    HFETAinstance **prev = NULL;
-    HFETAinstance *here;
-
-    for (; model; model = model->HFETAnextModel) {
-        prev = &(model->HFETAinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->HFETAname == name || (fast && here == *fast)) {
-                *prev = here->HFETAnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->HFETAnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/hfet1/hfetext.h b/src/spicelib/devices/hfet1/hfetext.h
index 36d866f2d..93774d10d 100644
--- a/src/spicelib/devices/hfet1/hfetext.h
+++ b/src/spicelib/devices/hfet1/hfetext.h
@@ -5,7 +5,7 @@ Modified: Paolo Nenzi
 
 extern int HFETAacLoad(GENmodel*,CKTcircuit*);
 extern int HFETAask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int HFETAdelete(GENmodel*,IFuid,GENinstance**);
+extern int HFETAdelete(GENinstance*);
 extern void HFETAdestroy(GENmodel**);
 extern int HFETAgetic(GENmodel*,CKTcircuit*);
 extern int HFETAload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/hfet2/hfet2del.c b/src/spicelib/devices/hfet2/hfet2del.c
index f905b1e7d..e40369863 100644
--- a/src/spicelib/devices/hfet2/hfet2del.c
+++ b/src/spicelib/devices/hfet2/hfet2del.c
@@ -14,24 +14,8 @@ Author: 1985 S. Hwang
 
 
 int
-HFET2delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+HFET2delete(GENinstance *gen_inst)
 {
-    HFET2model *model = (HFET2model *) inModel;
-    HFET2instance **fast = (HFET2instance **) inst;
-    HFET2instance **prev = NULL;
-    HFET2instance *here;
-
-    for (; model; model = model->HFET2nextModel) {
-        prev = &(model->HFET2instances);
-        for (here = *prev; here; here = *prev) {
-            if (here->HFET2name == name || (fast && here == *fast)) {
-                *prev = here->HFET2nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->HFET2nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/hfet2/hfet2ext.h b/src/spicelib/devices/hfet2/hfet2ext.h
index 243861744..95690e74b 100644
--- a/src/spicelib/devices/hfet2/hfet2ext.h
+++ b/src/spicelib/devices/hfet2/hfet2ext.h
@@ -5,7 +5,7 @@ Author: Trond Ytterdal
 
 extern int  HFET2acLoad(GENmodel*,CKTcircuit*);
 extern int  HFET2ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int  HFET2delete(GENmodel*,IFuid,GENinstance**);
+extern int  HFET2delete(GENinstance*);
 extern void HFET2destroy(GENmodel**);
 extern int  HFET2getic(GENmodel*,CKTcircuit*);
 extern int  HFET2load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/hisim2/hsm2del.c b/src/spicelib/devices/hisim2/hsm2del.c
index ff30f1b33..00d7c74c6 100644
--- a/src/spicelib/devices/hisim2/hsm2del.c
+++ b/src/spicelib/devices/hisim2/hsm2del.c
@@ -62,27 +62,8 @@ to others."
 
 
 int
-HSM2delete(
-               GENmodel *inModel,
-               IFuid name,
-               GENinstance **inInst)
+HSM2delete(GENinstance *gen_inst)
 {
-    HSM2instance **fast = (HSM2instance **) inInst;
-    HSM2model *model = (HSM2model *) inModel;
-    HSM2instance **prev = NULL;
-    HSM2instance *here;
-
-    for (; model; model = model->HSM2nextModel) {
-        prev = &(model->HSM2instances);
-        for (here = *prev; here; here = *prev) {
-            if (here->HSM2name == name || (fast && here == *fast)) {
-                *prev = here->HSM2nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->HSM2nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/hisim2/hsm2ext.h b/src/spicelib/devices/hisim2/hsm2ext.h
index ebae516e6..00802d6c7 100644
--- a/src/spicelib/devices/hisim2/hsm2ext.h
+++ b/src/spicelib/devices/hisim2/hsm2ext.h
@@ -18,7 +18,7 @@
 extern int HSM2acLoad(GENmodel *,CKTcircuit*);
 extern int HSM2ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int HSM2convTest(GENmodel *,CKTcircuit*);
-extern int HSM2delete(GENmodel*,IFuid,GENinstance**);
+extern int HSM2delete(GENinstance*);
 extern void HSM2destroy(GENmodel**);
 extern int HSM2getic(GENmodel*,CKTcircuit*);
 extern int HSM2load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/hisimhv1/hsmhvdel.c b/src/spicelib/devices/hisimhv1/hsmhvdel.c
index 3479b8cfd..8e1e9d818 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvdel.c
+++ b/src/spicelib/devices/hisimhv1/hsmhvdel.c
@@ -23,27 +23,8 @@
 
 
 int
-HSMHVdelete(
-                GENmodel *inModel,
-                IFuid name,
-                GENinstance **inInst)
+HSMHVdelete(GENinstance *gen_inst)
 {
-    HSMHVinstance **fast = (HSMHVinstance **) inInst;
-    HSMHVmodel *model = (HSMHVmodel *) inModel;
-    HSMHVinstance **prev = NULL;
-    HSMHVinstance *here;
-
-    for (; model; model = model->HSMHVnextModel) {
-        prev = &(model->HSMHVinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->HSMHVname == name || (fast && here == *fast)) {
-                *prev = here->HSMHVnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->HSMHVnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/hisimhv1/hsmhvext.h b/src/spicelib/devices/hisimhv1/hsmhvext.h
index 7ba0be7ba..bf40c6738 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvext.h
+++ b/src/spicelib/devices/hisimhv1/hsmhvext.h
@@ -18,7 +18,7 @@
 extern int HSMHVacLoad(GENmodel *,CKTcircuit*);
 extern int HSMHVask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int HSMHVconvTest(GENmodel *,CKTcircuit*);
-extern int HSMHVdelete(GENmodel*,IFuid,GENinstance**);
+extern int HSMHVdelete(GENinstance*);
 extern void HSMHVdestroy(GENmodel**);
 extern int HSMHVgetic(GENmodel*,CKTcircuit*);
 extern int HSMHVload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/hisimhv2/hsmhv2del.c b/src/spicelib/devices/hisimhv2/hsmhv2del.c
index 1b753e2e1..ea81a14b8 100644
--- a/src/spicelib/devices/hisimhv2/hsmhv2del.c
+++ b/src/spicelib/devices/hisimhv2/hsmhv2del.c
@@ -65,27 +65,8 @@ June 2008 (revised October 2011)
 
 
 int
-HSMHV2delete(
-                 GENmodel *inModel,
-                 IFuid name,
-                 GENinstance **inInst)
+HSMHV2delete(GENinstance *gen_inst)
 {
-    HSMHV2instance **fast = (HSMHV2instance **) inInst;
-    HSMHV2model *model = (HSMHV2model *) inModel;
-    HSMHV2instance **prev = NULL;
-    HSMHV2instance *here;
-
-    for (; model; model = model->HSMHV2nextModel) {
-        prev = &(model->HSMHV2instances);
-        for (here = *prev; here; here = *prev) {
-            if (here->HSMHV2name == name || (fast && here == *fast)) {
-                *prev = here->HSMHV2nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->HSMHV2nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/hisimhv2/hsmhv2ext.h b/src/spicelib/devices/hisimhv2/hsmhv2ext.h
index db1197414..b67f5cd2e 100644
--- a/src/spicelib/devices/hisimhv2/hsmhv2ext.h
+++ b/src/spicelib/devices/hisimhv2/hsmhv2ext.h
@@ -18,7 +18,7 @@
 extern int HSMHV2acLoad(GENmodel *,CKTcircuit*);
 extern int HSMHV2ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int HSMHV2convTest(GENmodel *,CKTcircuit*);
-extern int HSMHV2delete(GENmodel*,IFuid,GENinstance**);
+extern int HSMHV2delete(GENinstance*);
 extern void HSMHV2destroy(GENmodel**);
 extern int HSMHV2getic(GENmodel*,CKTcircuit*);
 extern int HSMHV2load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/ind/inddel.c b/src/spicelib/devices/ind/inddel.c
index d543da36f..0bca432ae 100644
--- a/src/spicelib/devices/ind/inddel.c
+++ b/src/spicelib/devices/ind/inddel.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-INDdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
+INDdelete(GENinstance *gen_inst)
 {
-    INDmodel *model = (INDmodel *) inModel;
-    INDinstance **fast = (INDinstance **) kill;
-    INDinstance **prev = NULL;
-    INDinstance *here;
-
-    for (; model; model = model->INDnextModel) {
-        prev = &(model->INDinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->INDname == name || (fast && here == *fast)) {
-                *prev = here->INDnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->INDnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/ind/indext.h b/src/spicelib/devices/ind/indext.h
index 8d2fa035c..f9c912d6c 100644
--- a/src/spicelib/devices/ind/indext.h
+++ b/src/spicelib/devices/ind/indext.h
@@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles
 extern int INDacLoad(GENmodel*,CKTcircuit*);
 extern int INDask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int INDmAsk(CKTcircuit*, GENmodel*, int, IFvalue*);
-extern int INDdelete(GENmodel*,IFuid,GENinstance**);
+extern int INDdelete(GENinstance*);
 extern void INDdestroy(GENmodel**);
 extern int INDload(GENmodel*,CKTcircuit*);
 extern int INDmDelete(GENmodel**,IFuid,GENmodel*);
@@ -27,7 +27,7 @@ extern int INDtrunc(GENmodel*,CKTcircuit*,double*);
 
 extern int MUTacLoad(GENmodel*,CKTcircuit*);
 extern int MUTask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int MUTdelete(GENmodel*,IFuid,GENinstance**);
+extern int MUTdelete(GENinstance*);
 extern void MUTdestroy(GENmodel**);
 extern int MUTmDelete(GENmodel**,IFuid,GENmodel*);
 extern int MUTparam(int,IFvalue*,GENinstance*,IFvalue*);
diff --git a/src/spicelib/devices/ind/mutdel.c b/src/spicelib/devices/ind/mutdel.c
index 550b2009b..b130cd089 100644
--- a/src/spicelib/devices/ind/mutdel.c
+++ b/src/spicelib/devices/ind/mutdel.c
@@ -11,25 +11,9 @@ Author: 1985 Thomas L. Quarles
 
 #ifdef MUTUAL
 int
-MUTdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
+MUTdelete(GENinstance *gen_inst)
 {
-    MUTmodel *model = (MUTmodel *) inModel;
-    MUTinstance **fast = (MUTinstance **) kill;
-    MUTinstance **prev = NULL;
-    MUTinstance *here;
-
-    for (; model; model = model->MUTnextModel) {
-        prev = &(model->MUTinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->MUTname == name || (fast && here == *fast)) {
-                *prev = here->MUTnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->MUTnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
 #endif /*MUTUAL*/
diff --git a/src/spicelib/devices/isrc/isrcdel.c b/src/spicelib/devices/isrc/isrcdel.c
index 24fd209ce..cbf3b0bc2 100644
--- a/src/spicelib/devices/isrc/isrcdel.c
+++ b/src/spicelib/devices/isrc/isrcdel.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-ISRCdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+ISRCdelete(GENinstance *gen_inst)
 {
-    ISRCmodel *model = (ISRCmodel *) inModel;
-    ISRCinstance **fast = (ISRCinstance **) inst;
-    ISRCinstance **prev = NULL;
-    ISRCinstance *here;
-
-    for (; model; model = model->ISRCnextModel) {
-        prev = &(model->ISRCinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->ISRCname == name || (fast && here == *fast)) {
-                *prev = here->ISRCnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->ISRCnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/isrc/isrcext.h b/src/spicelib/devices/isrc/isrcext.h
index fee30625b..57ad03f7a 100644
--- a/src/spicelib/devices/isrc/isrcext.h
+++ b/src/spicelib/devices/isrc/isrcext.h
@@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles
 extern int ISRCaccept(CKTcircuit*,GENmodel*);
 extern int ISRCacLoad(GENmodel*,CKTcircuit*);
 extern int ISRCask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int ISRCdelete(GENmodel*,IFuid,GENinstance**);
+extern int ISRCdelete(GENinstance*);
 extern void ISRCdestroy(GENmodel**);
 extern int ISRCload(GENmodel*,CKTcircuit*);
 extern int ISRCmDelete(GENmodel**,IFuid,GENmodel*);
diff --git a/src/spicelib/devices/jfet/jfetdel.c b/src/spicelib/devices/jfet/jfetdel.c
index 1b297e70b..02f863bab 100644
--- a/src/spicelib/devices/jfet/jfetdel.c
+++ b/src/spicelib/devices/jfet/jfetdel.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-JFETdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+JFETdelete(GENinstance *gen_inst)
 {
-    JFETmodel *model = (JFETmodel *) inModel;
-    JFETinstance **fast = (JFETinstance **) inst;
-    JFETinstance **prev = NULL;
-    JFETinstance *here;
-
-    for (; model; model = model->JFETnextModel) {
-        prev = &(model->JFETinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->JFETname == name || (fast && here == *fast)) {
-                *prev = here->JFETnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->JFETnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/jfet/jfetext.h b/src/spicelib/devices/jfet/jfetext.h
index 475bdbe1a..ea191dcc5 100644
--- a/src/spicelib/devices/jfet/jfetext.h
+++ b/src/spicelib/devices/jfet/jfetext.h
@@ -6,7 +6,7 @@ Modified: 2000 AlansFixes
 
 extern int JFETacLoad(GENmodel*,CKTcircuit*);
 extern int JFETask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int JFETdelete(GENmodel*,IFuid,GENinstance**);
+extern int JFETdelete(GENinstance*);
 extern void JFETdestroy(GENmodel**);
 extern int JFETgetic(GENmodel*,CKTcircuit*);
 extern int JFETload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/jfet2/jfet2del.c b/src/spicelib/devices/jfet2/jfet2del.c
index b9a681d94..c4f457ab7 100644
--- a/src/spicelib/devices/jfet2/jfet2del.c
+++ b/src/spicelib/devices/jfet2/jfet2del.c
@@ -14,24 +14,8 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker )
 
 
 int
-JFET2delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+JFET2delete(GENinstance *gen_inst)
 {
-    JFET2model *model = (JFET2model *) inModel;
-    JFET2instance **fast = (JFET2instance **) inst;
-    JFET2instance **prev = NULL;
-    JFET2instance *here;
-
-    for (; model; model = model->JFET2nextModel) {
-        prev = &(model->JFET2instances);
-        for (here = *prev; here; here = *prev) {
-            if (here->JFET2name == name || (fast && here == *fast)) {
-                *prev = here->JFET2nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->JFET2nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/jfet2/jfet2ext.h b/src/spicelib/devices/jfet2/jfet2ext.h
index fc330fe59..c4565abe5 100644
--- a/src/spicelib/devices/jfet2/jfet2ext.h
+++ b/src/spicelib/devices/jfet2/jfet2ext.h
@@ -9,7 +9,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(GENmodel*,IFuid,GENinstance**);
+extern int JFET2delete(GENinstance*);
 extern void JFET2destroy(GENmodel**);
 extern int JFET2getic(GENmodel*,CKTcircuit*);
 extern int JFET2load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/ltra/ltradel.c b/src/spicelib/devices/ltra/ltradel.c
index 9bcf907f3..394566a73 100644
--- a/src/spicelib/devices/ltra/ltradel.c
+++ b/src/spicelib/devices/ltra/ltradel.c
@@ -10,24 +10,8 @@ Author: 1990 Jaijeet S. Roychowdhury
 
 
 int
-LTRAdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
+LTRAdelete(GENinstance *gen_inst)
 {
-    LTRAinstance **fast = (LTRAinstance **) kill;
-    LTRAmodel *model = (LTRAmodel *) inModel;
-    LTRAinstance **prev = NULL;
-    LTRAinstance *here;
-
-    for (; model; model = model->LTRAnextModel) {
-        prev = &(model->LTRAinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->LTRAname == name || (fast && here == *fast)) {
-                *prev = here->LTRAnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->LTRAnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/ltra/ltraext.h b/src/spicelib/devices/ltra/ltraext.h
index 09cc06a8c..3524fa04e 100644
--- a/src/spicelib/devices/ltra/ltraext.h
+++ b/src/spicelib/devices/ltra/ltraext.h
@@ -8,7 +8,7 @@ Modified: 2000 AlansFixes
 extern int LTRAaccept(CKTcircuit*,GENmodel*);
 extern int LTRAask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int LTRAacLoad(GENmodel*,CKTcircuit*);
-extern int LTRAdelete(GENmodel*,IFuid,GENinstance**);
+extern int LTRAdelete(GENinstance*);
 extern void LTRAdestroy(GENmodel**);
 extern int LTRAload(GENmodel*,CKTcircuit*);
 extern int LTRAmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/mes/mesdel.c b/src/spicelib/devices/mes/mesdel.c
index fabdbedf5..d45785465 100644
--- a/src/spicelib/devices/mes/mesdel.c
+++ b/src/spicelib/devices/mes/mesdel.c
@@ -10,24 +10,8 @@ Author: 1985 S. Hwang
 
 
 int
-MESdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MESdelete(GENinstance *gen_inst)
 {
-    MESmodel *model = (MESmodel *) inModel;
-    MESinstance **fast = (MESinstance **) inst;
-    MESinstance **prev = NULL;
-    MESinstance *here;
-
-    for (; model; model = model->MESnextModel) {
-        prev = &(model->MESinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->MESname == name || (fast && here == *fast)) {
-                *prev = here->MESnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->MESnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/mes/mesext.h b/src/spicelib/devices/mes/mesext.h
index 7ff419573..61707e059 100644
--- a/src/spicelib/devices/mes/mesext.h
+++ b/src/spicelib/devices/mes/mesext.h
@@ -6,7 +6,7 @@ Modified: 2000 AlansFixes
 
 extern int MESacLoad(GENmodel*,CKTcircuit*);
 extern int MESask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int MESdelete(GENmodel*,IFuid,GENinstance**);
+extern int MESdelete(GENinstance*);
 extern void MESdestroy(GENmodel**);
 extern int MESgetic(GENmodel*,CKTcircuit*);
 extern int MESload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/mesa/mesadel.c b/src/spicelib/devices/mesa/mesadel.c
index 995364eb2..b1c4f47d4 100644
--- a/src/spicelib/devices/mesa/mesadel.c
+++ b/src/spicelib/devices/mesa/mesadel.c
@@ -14,24 +14,8 @@ Author: 1985 S. Hwang
 
 
 int
-MESAdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MESAdelete(GENinstance *gen_inst)
 {
-    MESAmodel *model = (MESAmodel *) inModel;
-    MESAinstance **fast = (MESAinstance **) inst;
-    MESAinstance **prev = NULL;
-    MESAinstance *here;
-
-    for (; model; model = model->MESAnextModel) {
-        prev = &(model->MESAinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->MESAname == name || (fast && here == *fast)) {
-                *prev = here->MESAnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->MESAnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/mesa/mesaext.h b/src/spicelib/devices/mesa/mesaext.h
index a1967cf44..4910567e5 100644
--- a/src/spicelib/devices/mesa/mesaext.h
+++ b/src/spicelib/devices/mesa/mesaext.h
@@ -5,7 +5,7 @@ Author: Trond Ytterdal
 
 extern int MESAacLoad(GENmodel*,CKTcircuit*);
 extern int MESAask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int MESAdelete(GENmodel*,IFuid,GENinstance**);
+extern int MESAdelete(GENinstance*);
 extern void MESAdestroy(GENmodel**);
 extern int MESAgetic(GENmodel*,CKTcircuit*);
 extern int MESAload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/mos1/mos1del.c b/src/spicelib/devices/mos1/mos1del.c
index 06a3e485c..2a7b36532 100644
--- a/src/spicelib/devices/mos1/mos1del.c
+++ b/src/spicelib/devices/mos1/mos1del.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-MOS1delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MOS1delete(GENinstance *gen_inst)
 {
-    MOS1model *model = (MOS1model *) inModel;
-    MOS1instance **fast = (MOS1instance **) inst;
-    MOS1instance **prev = NULL;
-    MOS1instance *here;
-
-    for (; model; model = model->MOS1nextModel) {
-        prev = &(model->MOS1instances);
-        for (here = *prev; here; here = *prev) {
-            if (here->MOS1name == name || (fast && here == *fast)) {
-                *prev = here->MOS1nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->MOS1nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/mos1/mos1ext.h b/src/spicelib/devices/mos1/mos1ext.h
index b1ed69d52..444e94a0d 100644
--- a/src/spicelib/devices/mos1/mos1ext.h
+++ b/src/spicelib/devices/mos1/mos1ext.h
@@ -6,7 +6,7 @@ Modified: 2000 AlansFixes
 
 extern int MOS1acLoad(GENmodel *,CKTcircuit*);
 extern int MOS1ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int MOS1delete(GENmodel*,IFuid,GENinstance**);
+extern int MOS1delete(GENinstance*);
 extern void MOS1destroy(GENmodel**);
 extern int MOS1getic(GENmodel*,CKTcircuit*);
 extern int MOS1load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/mos2/mos2del.c b/src/spicelib/devices/mos2/mos2del.c
index d421b7587..c8e8843a8 100644
--- a/src/spicelib/devices/mos2/mos2del.c
+++ b/src/spicelib/devices/mos2/mos2del.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-MOS2delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MOS2delete(GENinstance *gen_inst)
 {
-    MOS2model *model = (MOS2model *) inModel;
-    MOS2instance **fast = (MOS2instance **) inst;
-    MOS2instance **prev = NULL;
-    MOS2instance *here;
-
-    for (; model; model = model->MOS2nextModel) {
-        prev = &(model->MOS2instances);
-        for (here = *prev; here; here = *prev) {
-            if (here->MOS2name == name || (fast && here == *fast)) {
-                *prev = here->MOS2nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->MOS2nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/mos2/mos2ext.h b/src/spicelib/devices/mos2/mos2ext.h
index 46a8a3e38..e0d356e5c 100644
--- a/src/spicelib/devices/mos2/mos2ext.h
+++ b/src/spicelib/devices/mos2/mos2ext.h
@@ -8,7 +8,7 @@ extern int MOS2acLoad(GENmodel*,CKTcircuit*);
 extern int MOS2ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int MOS2mAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
 extern int MOS2convTest(GENmodel*,CKTcircuit*);
-extern int MOS2delete(GENmodel*,IFuid,GENinstance**);
+extern int MOS2delete(GENinstance*);
 extern void MOS2destroy(GENmodel**);
 extern int MOS2getic(GENmodel*,CKTcircuit*);
 extern int MOS2load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/mos3/mos3del.c b/src/spicelib/devices/mos3/mos3del.c
index 89ec0eb76..c150fdc28 100644
--- a/src/spicelib/devices/mos3/mos3del.c
+++ b/src/spicelib/devices/mos3/mos3del.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-MOS3delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MOS3delete(GENinstance *gen_inst)
 {
-    MOS3model *model = (MOS3model *) inModel;
-    MOS3instance **fast = (MOS3instance **) inst;
-    MOS3instance **prev = NULL;
-    MOS3instance *here;
-
-    for (; model; model = model->MOS3nextModel) {
-        prev = &(model->MOS3instances);
-        for (here = *prev; here; here = *prev) {
-            if (here->MOS3name == name || (fast && here == *fast)) {
-                *prev = here->MOS3nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->MOS3nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/mos3/mos3ext.h b/src/spicelib/devices/mos3/mos3ext.h
index 843d68329..ca8f4f750 100644
--- a/src/spicelib/devices/mos3/mos3ext.h
+++ b/src/spicelib/devices/mos3/mos3ext.h
@@ -7,7 +7,7 @@ Modified: 2000 AlansFixes
 extern int MOS3acLoad(GENmodel*,CKTcircuit*);
 extern int MOS3ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int MOS3convTest(GENmodel *,CKTcircuit *);
-extern int MOS3delete(GENmodel*,IFuid,GENinstance**);
+extern int MOS3delete(GENinstance*);
 extern void MOS3destroy(GENmodel**);
 extern int MOS3getic(GENmodel*,CKTcircuit*);
 extern int MOS3load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/mos6/mos6del.c b/src/spicelib/devices/mos6/mos6del.c
index 9a1b43700..74a43a92d 100644
--- a/src/spicelib/devices/mos6/mos6del.c
+++ b/src/spicelib/devices/mos6/mos6del.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-MOS6delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MOS6delete(GENinstance *gen_inst)
 {
-    MOS6model *model = (MOS6model *) inModel;
-    MOS6instance **fast = (MOS6instance **) inst;
-    MOS6instance **prev = NULL;
-    MOS6instance *here;
-
-    for (; model; model = model->MOS6nextModel) {
-        prev = &(model->MOS6instances);
-        for (here = *prev; here; here = *prev) {
-            if (here->MOS6name == name || (fast && here == *fast)) {
-                *prev = here->MOS6nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->MOS6nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/mos6/mos6ext.h b/src/spicelib/devices/mos6/mos6ext.h
index e5d203145..fd728ff56 100644
--- a/src/spicelib/devices/mos6/mos6ext.h
+++ b/src/spicelib/devices/mos6/mos6ext.h
@@ -5,7 +5,7 @@ Author: 1985 Thomas L. Quarles
 
 extern int MOS6acLoad(GENmodel *,CKTcircuit*);
 extern int MOS6ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int MOS6delete(GENmodel*,IFuid,GENinstance**);
+extern int MOS6delete(GENinstance*);
 extern void MOS6destroy(GENmodel**);
 extern int MOS6getic(GENmodel*,CKTcircuit*);
 extern int MOS6load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/mos9/mos9del.c b/src/spicelib/devices/mos9/mos9del.c
index f3ec537d4..89205d2da 100644
--- a/src/spicelib/devices/mos9/mos9del.c
+++ b/src/spicelib/devices/mos9/mos9del.c
@@ -11,24 +11,8 @@ Modified: Alan Gillespie
 
 
 int
-MOS9delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MOS9delete(GENinstance *gen_inst)
 {
-    MOS9model *model = (MOS9model *) inModel;
-    MOS9instance **fast = (MOS9instance **) inst;
-    MOS9instance **prev = NULL;
-    MOS9instance *here;
-
-    for (; model; model = model->MOS9nextModel) {
-        prev = &(model->MOS9instances);
-        for (here = *prev; here; here = *prev) {
-            if (here->MOS9name == name || (fast && here == *fast)) {
-                *prev = here->MOS9nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->MOS9nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/mos9/mos9ext.h b/src/spicelib/devices/mos9/mos9ext.h
index c2af0a136..f3bc5fb3e 100644
--- a/src/spicelib/devices/mos9/mos9ext.h
+++ b/src/spicelib/devices/mos9/mos9ext.h
@@ -7,7 +7,7 @@ Modified: Alan Gillespie
 extern int MOS9acLoad(GENmodel*,CKTcircuit*);
 extern int MOS9ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int MOS9convTest(GENmodel *,CKTcircuit *);
-extern int MOS9delete(GENmodel*,IFuid,GENinstance**);
+extern int MOS9delete(GENinstance*);
 extern void MOS9destroy(GENmodel**);
 extern int MOS9getic(GENmodel*,CKTcircuit*);
 extern int MOS9load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/nbjt/nbjtdel.c b/src/spicelib/devices/nbjt/nbjtdel.c
index 88e13117c..3854bae80 100644
--- a/src/spicelib/devices/nbjt/nbjtdel.c
+++ b/src/spicelib/devices/nbjt/nbjtdel.c
@@ -15,24 +15,8 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 int
-NBJTdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
+NBJTdelete(GENinstance *gen_inst)
 {
-    NBJTmodel *model = (NBJTmodel *) inModel;
-    NBJTinstance **fast = (NBJTinstance **) kill;
-    NBJTinstance **prev = NULL;
-    NBJTinstance *inst;
-
-    for (; model; model = model->NBJTnextModel) {
-        prev = &(model->NBJTinstances);
-        for (inst = *prev; inst; inst = *prev) {
-            if (inst->NBJTname == name || (fast && inst == *fast)) {
-                *prev = inst->NBJTnextInstance;
-                FREE(inst);
-                return(OK);
-            }
-            prev = &(inst->NBJTnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/nbjt/nbjtext.h b/src/spicelib/devices/nbjt/nbjtext.h
index b9d0a980c..ff2a85016 100644
--- a/src/spicelib/devices/nbjt/nbjtext.h
+++ b/src/spicelib/devices/nbjt/nbjtext.h
@@ -8,7 +8,7 @@ Author: 1987 Karti Mayaram
 
 extern int NBJTacLoad(GENmodel *, CKTcircuit *);
 extern int NBJTask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
-extern int NBJTdelete(GENmodel *, IFuid, GENinstance **);
+extern int NBJTdelete(GENinstance *);
 extern void NBJTdestroy(GENmodel **);
 extern int NBJTgetic(GENmodel *, CKTcircuit *);
 extern int NBJTload(GENmodel *, CKTcircuit *);
diff --git a/src/spicelib/devices/nbjt2/nbjt2ext.h b/src/spicelib/devices/nbjt2/nbjt2ext.h
index 7448e637d..73ba11181 100644
--- a/src/spicelib/devices/nbjt2/nbjt2ext.h
+++ b/src/spicelib/devices/nbjt2/nbjt2ext.h
@@ -9,7 +9,7 @@ Author: 1987 Karti Mayaram
 
 extern int NBJT2acLoad(GENmodel *, CKTcircuit *);
 extern int NBJT2ask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
-extern int NBJT2delete(GENmodel *, IFuid, GENinstance **);
+extern int NBJT2delete(GENinstance *);
 extern void NBJT2destroy(GENmodel **);
 extern int NBJT2getic(GENmodel *, CKTcircuit *);
 extern int NBJT2load(GENmodel *, CKTcircuit *);
diff --git a/src/spicelib/devices/nbjt2/nbt2del.c b/src/spicelib/devices/nbjt2/nbt2del.c
index 99bdae24f..783360712 100644
--- a/src/spicelib/devices/nbjt2/nbt2del.c
+++ b/src/spicelib/devices/nbjt2/nbt2del.c
@@ -15,24 +15,8 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 int
-NBJT2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
+NBJT2delete(GENinstance *gen_inst)
 {
-    NBJT2model *model = (NBJT2model *) inModel;
-    NBJT2instance **fast = (NBJT2instance **) kill;
-    NBJT2instance **prev = NULL;
-    NBJT2instance *inst;
-
-    for (; model; model = model->NBJT2nextModel) {
-        prev = &(model->NBJT2instances);
-        for (inst = *prev; inst; inst = *prev) {
-            if (inst->NBJT2name == name || (fast && inst == *fast)) {
-                *prev = inst->NBJT2nextInstance;
-                FREE(inst);
-                return(OK);
-            }
-            prev = &(inst->NBJT2nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/ndev/ndevdel.c b/src/spicelib/devices/ndev/ndevdel.c
index 435d1de57..93dd30fa3 100644
--- a/src/spicelib/devices/ndev/ndevdel.c
+++ b/src/spicelib/devices/ndev/ndevdel.c
@@ -11,27 +11,8 @@ University of Science and Technology of China
 
 
 int
-NDEVdelete(
-           GENmodel *inModel,
-           IFuid name,
-           GENinstance **kill)
+NDEVdelete(GENinstance *gen_inst)
 {
-    NDEVmodel *model = (NDEVmodel *) inModel;
-    NDEVinstance **fast = (NDEVinstance **) kill;
-    NDEVinstance **prev = NULL;
-    NDEVinstance *here;
-
-    for (; model; model = model->NDEVnextModel) {
-        prev = &(model->NDEVinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->NDEVname == name || (fast && here == *fast)) {
-                *prev = here->NDEVnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->NDEVnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/ndev/ndevext.h b/src/spicelib/devices/ndev/ndevext.h
index c751b5bdc..a42573a39 100644
--- a/src/spicelib/devices/ndev/ndevext.h
+++ b/src/spicelib/devices/ndev/ndevext.h
@@ -9,7 +9,7 @@ Author: 1987 Karti Mayaram
 
 extern int NDEVacLoad(GENmodel *, CKTcircuit *);
 extern int NDEVask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
-extern int NDEVdelete(GENmodel *, IFuid, GENinstance **);
+extern int NDEVdelete(GENinstance *);
 extern void NDEVdestroy(GENmodel **);
 extern int NDEVgetic(GENmodel *, CKTcircuit *);
 extern int NDEVload(GENmodel *, CKTcircuit *);
diff --git a/src/spicelib/devices/numd/numddel.c b/src/spicelib/devices/numd/numddel.c
index 27c74727a..99fea620e 100644
--- a/src/spicelib/devices/numd/numddel.c
+++ b/src/spicelib/devices/numd/numddel.c
@@ -10,24 +10,8 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 int
-NUMDdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
+NUMDdelete(GENinstance *gen_inst)
 {
-    NUMDmodel *model = (NUMDmodel *) inModel;
-    NUMDinstance **fast = (NUMDinstance **) kill;
-    NUMDinstance **prev = NULL;
-    NUMDinstance *inst;
-
-    for (; model; model = model->NUMDnextModel) {
-        prev = &(model->NUMDinstances);
-        for (inst = *prev; inst; inst = *prev) {
-            if (inst->NUMDname == name || (fast && inst == *fast)) {
-                *prev = inst->NUMDnextInstance;
-                FREE(inst);
-                return(OK);
-            }
-            prev = &(inst->NUMDnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/numd/numdext.h b/src/spicelib/devices/numd/numdext.h
index bf98dcd48..ab4a6d194 100644
--- a/src/spicelib/devices/numd/numdext.h
+++ b/src/spicelib/devices/numd/numdext.h
@@ -9,7 +9,7 @@ Author: 1987 Karti Mayaram
 
 extern int NUMDacLoad(GENmodel *, CKTcircuit *);
 extern int NUMDask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
-extern int NUMDdelete(GENmodel *, IFuid, GENinstance **);
+extern int NUMDdelete(GENinstance *);
 extern void NUMDdestroy(GENmodel **);
 extern int NUMDgetic(GENmodel *, CKTcircuit *);
 extern int NUMDload(GENmodel *, CKTcircuit *);
diff --git a/src/spicelib/devices/numd2/nud2del.c b/src/spicelib/devices/numd2/nud2del.c
index b57d5e645..f3be27796 100644
--- a/src/spicelib/devices/numd2/nud2del.c
+++ b/src/spicelib/devices/numd2/nud2del.c
@@ -10,24 +10,8 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 int
-NUMD2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
+NUMD2delete(GENinstance *gen_inst)
 {
-    NUMD2model *model = (NUMD2model *) inModel;
-    NUMD2instance **fast = (NUMD2instance **) kill;
-    NUMD2instance **prev = NULL;
-    NUMD2instance *inst;
-
-    for (; model; model = model->NUMD2nextModel) {
-        prev = &(model->NUMD2instances);
-        for (inst = *prev; inst; inst = *prev) {
-            if (inst->NUMD2name == name || (fast && inst == *fast)) {
-                *prev = inst->NUMD2nextInstance;
-                FREE(inst);
-                return(OK);
-            }
-            prev = &(inst->NUMD2nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/numd2/numd2ext.h b/src/spicelib/devices/numd2/numd2ext.h
index a23cd1169..0ee71429d 100644
--- a/src/spicelib/devices/numd2/numd2ext.h
+++ b/src/spicelib/devices/numd2/numd2ext.h
@@ -9,7 +9,7 @@ Author: 1987 Karti Mayaram
 
 extern int NUMD2acLoad(GENmodel *, CKTcircuit *);
 extern int NUMD2ask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
-extern int NUMD2delete(GENmodel *, IFuid, GENinstance **);
+extern int NUMD2delete(GENinstance *);
 extern void NUMD2destroy(GENmodel **);
 extern int NUMD2getic(GENmodel *, CKTcircuit *);
 extern int NUMD2load(GENmodel *, CKTcircuit *);
diff --git a/src/spicelib/devices/numos/nummdel.c b/src/spicelib/devices/numos/nummdel.c
index dd8b8943c..5603c9730 100644
--- a/src/spicelib/devices/numos/nummdel.c
+++ b/src/spicelib/devices/numos/nummdel.c
@@ -15,24 +15,8 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 int
-NUMOSdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
+NUMOSdelete(GENinstance *gen_inst)
 {
-    NUMOSmodel *model = (NUMOSmodel *) inModel;
-    NUMOSinstance **fast = (NUMOSinstance **) kill;
-    NUMOSinstance **prev = NULL;
-    NUMOSinstance *inst;
-
-    for (; model; model = model->NUMOSnextModel) {
-        prev = &(model->NUMOSinstances);
-        for (inst = *prev; inst; inst = *prev) {
-            if (inst->NUMOSname == name || (fast && inst == *fast)) {
-                *prev = inst->NUMOSnextInstance;
-                FREE(inst);
-                return(OK);
-            }
-            prev = &(inst->NUMOSnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/numos/numosext.h b/src/spicelib/devices/numos/numosext.h
index 411c5b03b..f5a7d50eb 100644
--- a/src/spicelib/devices/numos/numosext.h
+++ b/src/spicelib/devices/numos/numosext.h
@@ -9,7 +9,7 @@ Author: 1987 Karti Mayaram
 
 extern int NUMOSacLoad(GENmodel *, CKTcircuit *);
 extern int NUMOSask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
-extern int NUMOSdelete(GENmodel *, IFuid, GENinstance **);
+extern int NUMOSdelete(GENinstance *);
 extern void NUMOSdestroy(GENmodel **);
 extern int NUMOSgetic(GENmodel *, CKTcircuit *);
 extern int NUMOSload(GENmodel *, CKTcircuit *);
diff --git a/src/spicelib/devices/res/resdel.c b/src/spicelib/devices/res/resdel.c
index 86dc40364..0f5202863 100644
--- a/src/spicelib/devices/res/resdel.c
+++ b/src/spicelib/devices/res/resdel.c
@@ -10,24 +10,8 @@ Modified: Apr 2000 - Paolo Nenzi
 
 
 int
-RESdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+RESdelete(GENinstance *gen_inst)
 {
-    RESmodel *model = (RESmodel *) inModel;
-    RESinstance **fast = (RESinstance **) inst;
-    RESinstance **prev = NULL;
-    RESinstance *here;
-
-    for (; model; model = model->RESnextModel) {
-        prev = &(model->RESinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->RESname == name || (fast && here == *fast)) {
-                *prev = here->RESnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->RESnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/res/resext.h b/src/spicelib/devices/res/resext.h
index 148d1d222..8d9b3156a 100644
--- a/src/spicelib/devices/res/resext.h
+++ b/src/spicelib/devices/res/resext.h
@@ -4,7 +4,7 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 extern int RESask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int RESdelete(GENmodel*,IFuid,GENinstance**);
+extern int RESdelete(GENinstance*);
 extern void RESdestroy(GENmodel**);
 extern int RESload(GENmodel*,CKTcircuit*);
 extern int RESacload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/soi3/soi3del.c b/src/spicelib/devices/soi3/soi3del.c
index 3649c3590..f19d0e607 100644
--- a/src/spicelib/devices/soi3/soi3del.c
+++ b/src/spicelib/devices/soi3/soi3del.c
@@ -27,24 +27,8 @@ ngspice integration
 
 
 int
-SOI3delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+SOI3delete(GENinstance *gen_inst)
 {
-    SOI3model *model = (SOI3model *) inModel;
-    SOI3instance **fast = (SOI3instance **) inst;
-    SOI3instance **prev = NULL;
-    SOI3instance *here;
-
-    for (; model; model = model->SOI3nextModel) {
-        prev = &(model->SOI3instances);
-        for (here = *prev; here; here = *prev) {
-            if (here->SOI3name == name || (fast && here == *fast)) {
-                *prev = here->SOI3nextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->SOI3nextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/soi3/soi3ext.h b/src/spicelib/devices/soi3/soi3ext.h
index c7e194acd..6e2b74ee3 100644
--- a/src/spicelib/devices/soi3/soi3ext.h
+++ b/src/spicelib/devices/soi3/soi3ext.h
@@ -23,7 +23,7 @@ ngspice integration
 
 extern int SOI3acLoad(GENmodel *,CKTcircuit*);
 extern int SOI3ask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int SOI3delete(GENmodel*,IFuid,GENinstance**);
+extern int SOI3delete(GENinstance*);
 extern void SOI3destroy(GENmodel**);
 extern int SOI3getic(GENmodel*,CKTcircuit*);
 extern int SOI3load(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/sw/swdelete.c b/src/spicelib/devices/sw/swdelete.c
index 198c57b18..7c3ef4d29 100644
--- a/src/spicelib/devices/sw/swdelete.c
+++ b/src/spicelib/devices/sw/swdelete.c
@@ -10,24 +10,8 @@ Author: 1985 Gordon Jacobs
 
 
 int
-SWdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+SWdelete(GENinstance *gen_inst)
 {
-    SWmodel *model = (SWmodel *) inModel;
-    SWinstance **fast = (SWinstance **) inst;
-    SWinstance **prev = NULL;
-    SWinstance *here;
-
-    for (; model; model = model->SWnextModel) {
-        prev = &(model->SWinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->SWname == name || (fast && here == *fast)) {
-                *prev = here->SWnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->SWnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/sw/swext.h b/src/spicelib/devices/sw/swext.h
index ee447e7a9..17a2600cb 100644
--- a/src/spicelib/devices/sw/swext.h
+++ b/src/spicelib/devices/sw/swext.h
@@ -6,7 +6,7 @@ Modified: 2000 AlansFixes
 
 extern int SWacLoad(GENmodel*,CKTcircuit*);
 extern int SWask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int SWdelete(GENmodel*,IFuid,GENinstance**);
+extern int SWdelete(GENinstance*);
 extern void SWdestroy(GENmodel**);
 extern int SWload(GENmodel*,CKTcircuit*);
 extern int SWmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/tra/tradel.c b/src/spicelib/devices/tra/tradel.c
index 4f4ea31a5..2ab779109 100644
--- a/src/spicelib/devices/tra/tradel.c
+++ b/src/spicelib/devices/tra/tradel.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-TRAdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
+TRAdelete(GENinstance *gen_inst)
 {
-    TRAinstance **fast = (TRAinstance **) kill;
-    TRAmodel *model = (TRAmodel *) inModel;
-    TRAinstance **prev = NULL;
-    TRAinstance *here;
-
-    for (; model; model = model->TRAnextModel) {
-        prev = &(model->TRAinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->TRAname == name || (fast && here == *fast)) {
-                *prev = here->TRAnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->TRAnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/tra/traext.h b/src/spicelib/devices/tra/traext.h
index 95a1d2b25..9cabd24ad 100644
--- a/src/spicelib/devices/tra/traext.h
+++ b/src/spicelib/devices/tra/traext.h
@@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles
 extern int TRAacLoad(GENmodel*,CKTcircuit*);
 extern int TRAaccept(CKTcircuit*,GENmodel*);
 extern int TRAask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int TRAdelete(GENmodel*,IFuid,GENinstance**);
+extern int TRAdelete(GENinstance*);
 extern void TRAdestroy(GENmodel**);
 extern int TRAload(GENmodel*,CKTcircuit*);
 extern int TRAmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
diff --git a/src/spicelib/devices/txl/txldel.c b/src/spicelib/devices/txl/txldel.c
index 64f9496a5..9e97fae5a 100644
--- a/src/spicelib/devices/txl/txldel.c
+++ b/src/spicelib/devices/txl/txldel.c
@@ -11,24 +11,8 @@ Author: 1992 Charles Hough
 
 
 int
-TXLdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+TXLdelete(GENinstance *gen_inst)
 {
-    TXLmodel *model = (TXLmodel *) inModel;
-    TXLinstance **fast = (TXLinstance **) inst;
-    TXLinstance **prev = NULL;
-    TXLinstance *here;
-
-    for (; model; model = model->TXLnextModel) {
-        prev = &(model->TXLinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->TXLname == name || (fast && here == *fast)) {
-                *prev = here->TXLnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->TXLnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/txl/txlext.h b/src/spicelib/devices/txl/txlext.h
index 1211b71d0..5226d6200 100644
--- a/src/spicelib/devices/txl/txlext.h
+++ b/src/spicelib/devices/txl/txlext.h
@@ -1,7 +1,7 @@
 
 extern int TXLaccept(CKTcircuit*,GENmodel*);
 extern int TXLask(CKTcircuit*, GENinstance*, int, IFvalue*, IFvalue*);
-extern int TXLdelete(GENmodel*,IFuid,GENinstance**);
+extern int TXLdelete(GENinstance*);
 extern void TXLdestroy(GENmodel**);
 extern int TXLfindBr(CKTcircuit*, GENmodel*, IFuid);
 extern int TXLload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/urc/urcdel.c b/src/spicelib/devices/urc/urcdel.c
index 49f1bb029..8c0c3f58d 100644
--- a/src/spicelib/devices/urc/urcdel.c
+++ b/src/spicelib/devices/urc/urcdel.c
@@ -10,24 +10,8 @@ Author: 1987 Thomas L. Quarles
 
 
 int
-URCdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+URCdelete(GENinstance *gen_inst)
 {
-    URCmodel *model = (URCmodel *) inModel;
-    URCinstance **fast = (URCinstance **) inst;
-    URCinstance **prev = NULL;
-    URCinstance *here;
-
-    for (; model; model = model->URCnextModel) {
-        prev = &(model->URCinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->URCname == name || (fast && here == *fast)) {
-                *prev = here->URCnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->URCnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/urc/urcext.h b/src/spicelib/devices/urc/urcext.h
index 4cfe4172c..4fded7c13 100644
--- a/src/spicelib/devices/urc/urcext.h
+++ b/src/spicelib/devices/urc/urcext.h
@@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles
 #define _URCEXT_H
 
 extern int URCask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int URCdelete(GENmodel*,IFuid,GENinstance**);
+extern int URCdelete(GENinstance*);
 extern void URCdestroy(GENmodel**);
 extern int URCmAsk(CKTcircuit*,GENmodel*,int,IFvalue*);
 extern int URCmDelete(GENmodel**,IFuid,GENmodel*);
diff --git a/src/spicelib/devices/vbic/vbicdel.c b/src/spicelib/devices/vbic/vbicdel.c
index 051dfd328..35fd4e64d 100644
--- a/src/spicelib/devices/vbic/vbicdel.c
+++ b/src/spicelib/devices/vbic/vbicdel.c
@@ -17,24 +17,8 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH
 
 
 int
-VBICdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
+VBICdelete(GENinstance *gen_inst)
 {
-    VBICmodel *model = (VBICmodel *) inModel;
-    VBICinstance **fast = (VBICinstance **) kill;
-    VBICinstance **prev = NULL;
-    VBICinstance *here;
-
-    for (; model; model = model->VBICnextModel) {
-        prev = &(model->VBICinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->VBICname == name || (fast && here == *fast)) {
-                *prev = here->VBICnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->VBICnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/vbic/vbicext.h b/src/spicelib/devices/vbic/vbicext.h
index c0e0ff943..5df6699a0 100644
--- a/src/spicelib/devices/vbic/vbicext.h
+++ b/src/spicelib/devices/vbic/vbicext.h
@@ -11,7 +11,7 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH
 extern int VBICacLoad(GENmodel *,CKTcircuit*);
 extern int VBICask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*);
 extern int VBICconvTest(GENmodel*,CKTcircuit*);
-extern int VBICdelete(GENmodel*,IFuid,GENinstance**);
+extern int VBICdelete(GENinstance*);
 extern void VBICdestroy(GENmodel**);
 extern int VBICgetic(GENmodel*,CKTcircuit*);
 extern int VBICload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/vccs/vccsdel.c b/src/spicelib/devices/vccs/vccsdel.c
index 6ed5e687d..b809e2635 100644
--- a/src/spicelib/devices/vccs/vccsdel.c
+++ b/src/spicelib/devices/vccs/vccsdel.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-VCCSdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+VCCSdelete(GENinstance *gen_inst)
 {
-    VCCSmodel *model = (VCCSmodel *) inModel;
-    VCCSinstance **fast = (VCCSinstance **) inst;
-    VCCSinstance **prev = NULL;
-    VCCSinstance *here;
-
-    for (; model; model = model->VCCSnextModel) {
-        prev = &(model->VCCSinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->VCCSname == name || (fast && here == *fast)) {
-                *prev = here->VCCSnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->VCCSnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/vccs/vccsext.h b/src/spicelib/devices/vccs/vccsext.h
index 464020523..166995aba 100644
--- a/src/spicelib/devices/vccs/vccsext.h
+++ b/src/spicelib/devices/vccs/vccsext.h
@@ -4,7 +4,7 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 extern int VCCSask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int VCCSdelete(GENmodel*,IFuid,GENinstance**);
+extern int VCCSdelete(GENinstance*);
 extern void VCCSdestroy(GENmodel**);
 extern int VCCSload(GENmodel*,CKTcircuit*);
 extern int VCCSmDelete(GENmodel**,IFuid,GENmodel*);
diff --git a/src/spicelib/devices/vcvs/vcvsdel.c b/src/spicelib/devices/vcvs/vcvsdel.c
index 1129ef949..db3837718 100644
--- a/src/spicelib/devices/vcvs/vcvsdel.c
+++ b/src/spicelib/devices/vcvs/vcvsdel.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-VCVSdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+VCVSdelete(GENinstance *gen_inst)
 {
-    VCVSmodel *model = (VCVSmodel *) inModel;
-    VCVSinstance **fast = (VCVSinstance **) inst;
-    VCVSinstance **prev = NULL;
-    VCVSinstance *here;
-
-    for (; model; model = model->VCVSnextModel) {
-        prev = &(model->VCVSinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->VCVSname == name || (fast && here == *fast)) {
-                *prev = here->VCVSnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->VCVSnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/vcvs/vcvsext.h b/src/spicelib/devices/vcvs/vcvsext.h
index 3d3858273..e9979fda6 100644
--- a/src/spicelib/devices/vcvs/vcvsext.h
+++ b/src/spicelib/devices/vcvs/vcvsext.h
@@ -4,7 +4,7 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 extern int VCVSask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int VCVSdelete(GENmodel*,IFuid,GENinstance**);
+extern int VCVSdelete(GENinstance*);
 extern void VCVSdestroy(GENmodel**);
 extern int VCVSfindBr(CKTcircuit*,GENmodel*,IFuid);
 extern int VCVSload(GENmodel*,CKTcircuit*);
diff --git a/src/spicelib/devices/vsrc/vsrcdel.c b/src/spicelib/devices/vsrc/vsrcdel.c
index 126b925d6..663dd1d69 100644
--- a/src/spicelib/devices/vsrc/vsrcdel.c
+++ b/src/spicelib/devices/vsrc/vsrcdel.c
@@ -10,24 +10,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-VSRCdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+VSRCdelete(GENinstance *gen_inst)
 {
-    VSRCmodel *model = (VSRCmodel *) inModel;
-    VSRCinstance **fast = (VSRCinstance **) inst;
-    VSRCinstance **prev = NULL;
-    VSRCinstance *here;
-
-    for (; model; model = model->VSRCnextModel) {
-        prev = &(model->VSRCinstances);
-        for (here = *prev; here; here = *prev) {
-            if (here->VSRCname == name || (fast && here == *fast)) {
-                *prev = here->VSRCnextInstance;
-                FREE(here);
-                return(OK);
-            }
-            prev = &(here->VSRCnextInstance);
-        }
-    }
-
-    return(E_NODEV);
+    NG_IGNORE(gen_inst);
+    return OK;
 }
diff --git a/src/spicelib/devices/vsrc/vsrcext.h b/src/spicelib/devices/vsrc/vsrcext.h
index 980efbf8e..bce978c6a 100644
--- a/src/spicelib/devices/vsrc/vsrcext.h
+++ b/src/spicelib/devices/vsrc/vsrcext.h
@@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles
 extern int VSRCaccept(CKTcircuit*,GENmodel*);
 extern int VSRCacLoad(GENmodel*,CKTcircuit*);
 extern int VSRCask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
-extern int VSRCdelete(GENmodel*,IFuid,GENinstance**);
+extern int VSRCdelete(GENinstance*);
 extern void VSRCdestroy(GENmodel**);
 extern int VSRCfindBr(CKTcircuit*,GENmodel*,IFuid);
 extern int VSRCload(GENmodel*,CKTcircuit*);