diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c
index ae78087db..0046eae65 100644
--- a/src/frontend/spiceif.c
+++ b/src/frontend/spiceif.c
@@ -614,7 +614,7 @@ finddev_special(
     int err;
     int type = -1;
 
-    err = ft_sim->findInstance (ckt, &type, devptr, name, NULL);
+    err = ft_sim->findInstance (ckt, &type, devptr, name);
     if (err == OK) {
         *device_or_model = 0;
         return (type);
@@ -1215,7 +1215,7 @@ finddev(CKTcircuit *ckt, char *name, GENinstance **devptr, GENmodel **modptr)
     int err;
     int type = -1;
 
-    err = ft_sim->findInstance (ckt, &type, devptr, name, NULL);
+    err = ft_sim->findInstance (ckt, &type, devptr, name);
     if (err == OK)
         return (type);
 
diff --git a/src/include/ngspice/cktdefs.h b/src/include/ngspice/cktdefs.h
index d631016cb..927fa9e3b 100644
--- a/src/include/ngspice/cktdefs.h
+++ b/src/include/ngspice/cktdefs.h
@@ -319,7 +319,7 @@ extern void NDEVacct(CKTcircuit *ckt, FILE *file);
 extern void CKTncDump(CKTcircuit *);
 extern int CKTfndAnal(CKTcircuit *, int *, JOB **, IFuid , TSKtask *, IFuid);
 extern int CKTfndBranch(CKTcircuit *, IFuid);
-extern int CKTfndDev(CKTcircuit *, int *, GENinstance **, IFuid , GENmodel *);
+extern int CKTfndDev(CKTcircuit *, int *, GENinstance **, IFuid);
 extern int CKTfndMod(CKTcircuit *, int *, GENmodel **, IFuid);
 extern int CKTfndNode(CKTcircuit *, CKTnode **, IFuid);
 extern int CKTfndTask(CKTcircuit *, TSKtask **, IFuid );
diff --git a/src/include/ngspice/ifsim.h b/src/include/ngspice/ifsim.h
index e24f4f111..10e831d55 100644
--- a/src/include/ngspice/ifsim.h
+++ b/src/include/ngspice/ifsim.h
@@ -370,7 +370,7 @@ struct IFsimulator {
                                     /* set a parameter on an instance */
     int (*askInstanceQuest) (CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
                                     /* ask a question about an instance */
-    int (*findInstance) (CKTcircuit *, int *, GENinstance **, IFuid, GENmodel *);
+    int (*findInstance) (CKTcircuit *, int *, GENinstance **, IFuid);
                                     /* find a specific instance */
     int (*deleteInstance) (CKTcircuit *, void *);
                                     /* delete an instance from the circuit */
diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c
index 7c5c06814..b79cb29ce 100644
--- a/src/spicelib/analysis/noisean.c
+++ b/src/spicelib/analysis/noisean.c
@@ -48,7 +48,7 @@ NOISEan (CKTcircuit *ckt, int restart)
     inst = NULL;
     code = CKTtypelook("Vsource");
     if (code != -1) {
-        error = CKTfndDev(ckt, &code, &inst, job->input, NULL);
+        error = CKTfndDev(ckt, &code, &inst, job->input);
 	if (!error && !((VSRCinstance *)inst)->VSRCacGiven) {
 	    errMsg = TMALLOC(char, strlen(noacinput) + 1);
 	    strcpy(errMsg,noacinput);
@@ -58,7 +58,7 @@ NOISEan (CKTcircuit *ckt, int restart)
 
     code = CKTtypelook("Isource");
     if (code != -1 && inst==NULL) {
-        error = CKTfndDev(ckt, &code, &inst, job->input, NULL);
+        error = CKTfndDev(ckt, &code, &inst, job->input);
         if (error) {
 	    /* XXX ??? */
             SPfrontEnd->IFerror (ERR_WARNING,
diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c
index 2a611cbb1..bf462a7e0 100644
--- a/src/spicelib/analysis/tfanal.c
+++ b/src/spicelib/analysis/tfanal.c
@@ -51,7 +51,7 @@ TFanal(CKTcircuit *ckt, int restart)
     Itype = CKTtypelook("Isource");
     Vtype = CKTtypelook("Vsource");
     if(Itype != -1) {
-        error = CKTfndDev(ckt, &Itype, &ptr, job->TFinSrc, NULL);
+        error = CKTfndDev(ckt, &Itype, &ptr, job->TFinSrc);
         if(error ==0) {
             job->TFinIsI = 1;
             job->TFinIsV = 0;
@@ -61,7 +61,7 @@ TFanal(CKTcircuit *ckt, int restart)
     }
 
     if( (Vtype != -1) && (ptr==NULL) ) {
-        error = CKTfndDev(ckt, &Vtype, &ptr, job->TFinSrc, NULL);
+        error = CKTfndDev(ckt, &Vtype, &ptr, job->TFinSrc);
         job->TFinIsV = 1;
         job->TFinIsI = 0;
         if(error !=0) {
diff --git a/src/spicelib/devices/cktcrte.c b/src/spicelib/devices/cktcrte.c
index 3f8adce06..be8e7fbb0 100644
--- a/src/spicelib/devices/cktcrte.c
+++ b/src/spicelib/devices/cktcrte.c
@@ -31,7 +31,7 @@ CKTcrtElt(CKTcircuit *ckt, GENmodel *modPtr, GENinstance **inInstPtr, IFuid name
 
     type = modPtr->GENmodType;
 
-    error = CKTfndDev(ckt, &type, &instPtr, name, modPtr);
+    error = CKTfndDev(ckt, &type, &instPtr, name);
 
     if (error == OK) { 
         if (inInstPtr)
diff --git a/src/spicelib/devices/cktfinddev.c b/src/spicelib/devices/cktfinddev.c
index cb493f537..2b4ceed48 100644
--- a/src/spicelib/devices/cktfinddev.c
+++ b/src/spicelib/devices/cktfinddev.c
@@ -11,7 +11,7 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CKTfndDev(CKTcircuit *ckt, int *type, GENinstance **fast, IFuid name, GENmodel *modfast)
+CKTfndDev(CKTcircuit *ckt, int *type, GENinstance **fast, IFuid name)
 {
     GENinstance *here;
 
diff --git a/src/spicelib/devices/ind/mutsetup.c b/src/spicelib/devices/ind/mutsetup.c
index ae7fc1cab..b8d2fb6c5 100644
--- a/src/spicelib/devices/ind/mutsetup.c
+++ b/src/spicelib/devices/ind/mutsetup.c
@@ -43,7 +43,7 @@ MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
                 return(E_INTERN);
             }
 
-            error = CKTfndDev(ckt, &ktype, (GENinstance **) &(here->MUTind1), here->MUTindName1, NULL);
+            error = CKTfndDev(ckt, &ktype, (GENinstance **) &(here->MUTind1), here->MUTindName1);
             if(error && error!= E_NODEV && error != E_NOMOD) return(error);
             if(error) {
                 IFuid namarray[2];
@@ -53,7 +53,7 @@ MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
                     "%s: coupling to non-existant inductor %s.",
                     namarray);
             }
-            error = CKTfndDev(ckt, &ktype, (GENinstance **) &(here->MUTind2), here->MUTindName2, NULL);
+            error = CKTfndDev(ckt, &ktype, (GENinstance **) &(here->MUTind2), here->MUTindName2);
             if(error && error!= E_NODEV && error != E_NOMOD) return(error);
             if(error) {
                 IFuid namarray[2];
diff --git a/src/spicelib/parser/inpaname.c b/src/spicelib/parser/inpaname.c
index ed8f65d45..c0ffd83e4 100644
--- a/src/spicelib/parser/inpaname.c
+++ b/src/spicelib/parser/inpaname.c
@@ -40,7 +40,7 @@ INPaName(char *parm, IFvalue * val, CKTcircuit *ckt, int *dev, char *devnam,
      * (name, type, direct pointer) - the type and direct pointer
      * WILL be set on return unless error is not OK
      */
-    error = sim->findInstance (ckt, dev, fast, devnam, NULL);
+    error = sim->findInstance (ckt, dev, fast, devnam);
     if (error)
 	return (error);
 
diff --git a/src/tclspice.c b/src/tclspice.c
index a5b323c2e..add166b63 100644
--- a/src/tclspice.c
+++ b/src/tclspice.c
@@ -1394,7 +1394,7 @@ get_mod_param TCL_CMDPROCARGS(clientData, interp, argc, argv)
 
     /* get the unique IFuid for name (device/model) */
     INPretrieve(&name, ft_curckt->ci_symtab);
-    err = ft_sim->findInstance (ft_curckt->ci_ckt, &typecode, &devptr, name, NULL);
+    err = ft_sim->findInstance (ft_curckt->ci_ckt, &typecode, &devptr, name);
     if (err != OK) {
         typecode = -1;
         devptr   = NULL;
diff --git a/src/unsupported/snstart.c b/src/unsupported/snstart.c
index 893007642..28524e679 100644
--- a/src/unsupported/snstart.c
+++ b/src/unsupported/snstart.c
@@ -42,7 +42,7 @@ SENstartup(CKTcircuit *ckt, int restart)
         type = -1;
         fast = NULL;
 
-        err = CKTfndDev(ckt, &type, &fast, ckt->CKTsenInfo->SENdevices[i], NULL);
+        err = CKTfndDev(ckt, &type, &fast, ckt->CKTsenInfo->SENdevices[i]);
         if (err != OK)
             return err;