diff --git a/motorExApp/Makefile b/motorExApp/Makefile
index 571176fe..e4962b3a 100644
--- a/motorExApp/Makefile
+++ b/motorExApp/Makefile
@@ -1,10 +1,10 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 
-#DIRS += Db
-#DIRS += NoMPF
-ifdef MPF
-#DIRS += WithMPF
+DIRS += Db
+DIRS += NoMPF
+ifdef ASYN
+DIRS += WithMPF
 #DIRS += ipServerApp
 endif
 
diff --git a/motorExApp/WithAsyn/Makefile b/motorExApp/WithAsyn/Makefile
index c6ee0160..4d732a5f 100644
--- a/motorExApp/WithAsyn/Makefile
+++ b/motorExApp/WithAsyn/Makefile
@@ -23,26 +23,24 @@ WithMPF_OBJS_vxWorks	+= $(EPICS_BASE_BIN)/vxComLibrary
 #!WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib
 #!WithMPFVx_OBJS_vxWorks   += $(IPAC_BIN)/tyGSOctal
 
-WithMPF_LIBS		+= PI
+#WithMPF_LIBS		+= PI
 WithMPF_LIBS		+= Acs
-WithMPF_LIBS		+= Ims
+#WithMPF_LIBS		+= Ims
 WithMPF_LIBS		+= Newport
-WithMPF_LIBS		+= motorCOM_mpf
 WithMPF_LIBS		+= motor
-WithMPF_LIBS		+= mpfSerial mpfEpics mpf
+WithMPFVx_LIBS		+= asyn
 WithMPF_LIBS 		+= $(EPICS_BASE_IOC_LIBS)
 
-WithMPFVx_LIBS		+= PI
+#WithMPFVx_LIBS		+= PI
 WithMPFVx_LIBS		+= Acs
-WithMPFVx_LIBS		+= Ims
+#WithMPFVx_LIBS		+= Ims
 WithMPFVx_LIBS		+= Newport
-WithMPFVx_LIBS		+= motorCOM_mpf
 WithMPFVx_LIBS		+= motor
 
 # Support from IPAC R2.6 and above.
 WithMPFVx_LIBS 		+= Ipac TyGSOctal
 
-WithMPFVx_LIBS		+= mpfSerial mpfEpics mpf
+WithMPFVx_LIBS		+= asyn
 WithMPFVx_LIBS 		+= $(EPICS_BASE_IOC_LIBS)
 
 include $(TOP)/configure/RULES
diff --git a/motorExApp/WithAsyn/WithAsynInclude.dbd b/motorExApp/WithAsyn/WithAsynInclude.dbd
index 360c8438..f5c7f104 100644
--- a/motorExApp/WithAsyn/WithAsynInclude.dbd
+++ b/motorExApp/WithAsyn/WithAsynInclude.dbd
@@ -1,9 +1,7 @@
 include "base.dbd"
 include "motorRecord.dbd"
-include "mpf.dbd"
-include "devStringMpf.dbd"
-include "mpfSerial.dbd"
+include "asyn.dbd"
 include "devAcsMotor.dbd"
-include "devImsMotor.dbd"
+#include "devImsMotor.dbd"
 include "devNewport.dbd"
-include "devPIMotor.dbd"
+#include "devPIMotor.dbd"
diff --git a/motorExApp/WithAsyn/WithAsynVxInclude.dbd b/motorExApp/WithAsyn/WithAsynVxInclude.dbd
index 94f3770d..d196af5d 100644
--- a/motorExApp/WithAsyn/WithAsynVxInclude.dbd
+++ b/motorExApp/WithAsyn/WithAsynVxInclude.dbd
@@ -1,13 +1,11 @@
 include "base.dbd"
 include "motorRecord.dbd"
-include "mpfSerialVx.dbd"
+include "asyn.dbd"
 include "devAcsMotor.dbd"
-include "devImsMotor.dbd"
+#include "devImsMotor.dbd"
 include "devNewport.dbd"
-include "devPIMotor.dbd"
+#include "devPIMotor.dbd"
 # Only for IPAC R2.7 and above.
 driver(drvIpac)
 registrar(vipc616Registrar)
 registrar(tyGSOctalRegistrar)
-
-
diff --git a/motorExApp/WithAsyn/WithMPFInclude.dbd b/motorExApp/WithAsyn/WithMPFInclude.dbd
index 360c8438..f5c7f104 100644
--- a/motorExApp/WithAsyn/WithMPFInclude.dbd
+++ b/motorExApp/WithAsyn/WithMPFInclude.dbd
@@ -1,9 +1,7 @@
 include "base.dbd"
 include "motorRecord.dbd"
-include "mpf.dbd"
-include "devStringMpf.dbd"
-include "mpfSerial.dbd"
+include "asyn.dbd"
 include "devAcsMotor.dbd"
-include "devImsMotor.dbd"
+#include "devImsMotor.dbd"
 include "devNewport.dbd"
-include "devPIMotor.dbd"
+#include "devPIMotor.dbd"
diff --git a/motorExApp/WithAsyn/WithMPFVxInclude.dbd b/motorExApp/WithAsyn/WithMPFVxInclude.dbd
index 94f3770d..d196af5d 100644
--- a/motorExApp/WithAsyn/WithMPFVxInclude.dbd
+++ b/motorExApp/WithAsyn/WithMPFVxInclude.dbd
@@ -1,13 +1,11 @@
 include "base.dbd"
 include "motorRecord.dbd"
-include "mpfSerialVx.dbd"
+include "asyn.dbd"
 include "devAcsMotor.dbd"
-include "devImsMotor.dbd"
+#include "devImsMotor.dbd"
 include "devNewport.dbd"
-include "devPIMotor.dbd"
+#include "devPIMotor.dbd"
 # Only for IPAC R2.7 and above.
 driver(drvIpac)
 registrar(vipc616Registrar)
 registrar(tyGSOctalRegistrar)
-
-
diff --git a/motorExApp/WithMPF/Makefile b/motorExApp/WithMPF/Makefile
index c6ee0160..4d732a5f 100644
--- a/motorExApp/WithMPF/Makefile
+++ b/motorExApp/WithMPF/Makefile
@@ -23,26 +23,24 @@ WithMPF_OBJS_vxWorks	+= $(EPICS_BASE_BIN)/vxComLibrary
 #!WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib
 #!WithMPFVx_OBJS_vxWorks   += $(IPAC_BIN)/tyGSOctal
 
-WithMPF_LIBS		+= PI
+#WithMPF_LIBS		+= PI
 WithMPF_LIBS		+= Acs
-WithMPF_LIBS		+= Ims
+#WithMPF_LIBS		+= Ims
 WithMPF_LIBS		+= Newport
-WithMPF_LIBS		+= motorCOM_mpf
 WithMPF_LIBS		+= motor
-WithMPF_LIBS		+= mpfSerial mpfEpics mpf
+WithMPFVx_LIBS		+= asyn
 WithMPF_LIBS 		+= $(EPICS_BASE_IOC_LIBS)
 
-WithMPFVx_LIBS		+= PI
+#WithMPFVx_LIBS		+= PI
 WithMPFVx_LIBS		+= Acs
-WithMPFVx_LIBS		+= Ims
+#WithMPFVx_LIBS		+= Ims
 WithMPFVx_LIBS		+= Newport
-WithMPFVx_LIBS		+= motorCOM_mpf
 WithMPFVx_LIBS		+= motor
 
 # Support from IPAC R2.6 and above.
 WithMPFVx_LIBS 		+= Ipac TyGSOctal
 
-WithMPFVx_LIBS		+= mpfSerial mpfEpics mpf
+WithMPFVx_LIBS		+= asyn
 WithMPFVx_LIBS 		+= $(EPICS_BASE_IOC_LIBS)
 
 include $(TOP)/configure/RULES
diff --git a/motorExApp/WithMPF/WithMPFInclude.dbd b/motorExApp/WithMPF/WithMPFInclude.dbd
index 360c8438..f5c7f104 100644
--- a/motorExApp/WithMPF/WithMPFInclude.dbd
+++ b/motorExApp/WithMPF/WithMPFInclude.dbd
@@ -1,9 +1,7 @@
 include "base.dbd"
 include "motorRecord.dbd"
-include "mpf.dbd"
-include "devStringMpf.dbd"
-include "mpfSerial.dbd"
+include "asyn.dbd"
 include "devAcsMotor.dbd"
-include "devImsMotor.dbd"
+#include "devImsMotor.dbd"
 include "devNewport.dbd"
-include "devPIMotor.dbd"
+#include "devPIMotor.dbd"
diff --git a/motorExApp/WithMPF/WithMPFVxInclude.dbd b/motorExApp/WithMPF/WithMPFVxInclude.dbd
index 94f3770d..d196af5d 100644
--- a/motorExApp/WithMPF/WithMPFVxInclude.dbd
+++ b/motorExApp/WithMPF/WithMPFVxInclude.dbd
@@ -1,13 +1,11 @@
 include "base.dbd"
 include "motorRecord.dbd"
-include "mpfSerialVx.dbd"
+include "asyn.dbd"
 include "devAcsMotor.dbd"
-include "devImsMotor.dbd"
+#include "devImsMotor.dbd"
 include "devNewport.dbd"
-include "devPIMotor.dbd"
+#include "devPIMotor.dbd"
 # Only for IPAC R2.7 and above.
 driver(drvIpac)
 registrar(vipc616Registrar)
 registrar(tyGSOctalRegistrar)
-
-