diff --git a/motorExApp/WithAsyn/Makefile b/motorExApp/WithAsyn/Makefile
index ffaad3a8..1f563728 100644
--- a/motorExApp/WithAsyn/Makefile
+++ b/motorExApp/WithAsyn/Makefile
@@ -23,27 +23,27 @@ WithMPF_OBJS_vxWorks	+= $(EPICS_BASE_BIN)/vxComLibrary
 #!WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib
 #!WithMPFVx_OBJS_vxWorks   += $(IPAC_BIN)/tyGSOctal
 
-WithMPF_LIBS		+= Mclennan
-WithMPF_LIBS		+= Micos
-WithMPF_LIBS		+= MicroMo
-WithMPF_LIBS		+= PI
-WithMPF_LIBS		+= Acs
-WithMPF_LIBS		+= Ims
-WithMPF_LIBS		+= Newport
-WithMPF_LIBS		+= softMotor
-WithMPF_LIBS		+= motor
-WithMPF_LIBS		+= asyn
-WithMPF_LIBS 		+= $(EPICS_BASE_IOC_LIBS)
+#!WithMPF_LIBS   += Mclennan
+#!WithMPF_LIBS   += Micos
+#!WithMPF_LIBS   += MicroMo
+#!WithMPF_LIBS   += PI
+#!WithMPF_LIBS   += Acs
+#!WithMPF_LIBS   += Ims
+#!WithMPF_LIBS   += Newport
+#!WithMPF_LIBS   += softMotor
+WithMPF_LIBS     += motor
+WithMPF_LIBS     += asyn
+WithMPF_LIBS     += $(EPICS_BASE_IOC_LIBS)
 
-WithMPFVx_LIBS		+= Mclennan
-WithMPFVx_LIBS		+= Micos
-WithMPFVx_LIBS		+= MicroMo
-WithMPFVx_LIBS		+= PI
-WithMPFVx_LIBS		+= Acs
-WithMPFVx_LIBS		+= Ims
-WithMPFVx_LIBS		+= Newport
-WithMPFVx_LIBS		+= softMotor
-WithMPFVx_LIBS		+= motor
+#!WithMPFVx_LIBS += Mclennan
+#!WithMPFVx_LIBS += Micos
+#!WithMPFVx_LIBS += MicroMo
+#!WithMPFVx_LIBS += PI
+#!WithMPFVx_LIBS += Acs
+#!WithMPFVx_LIBS += Ims
+#!WithMPFVx_LIBS += Newport
+#!WithMPFVx_LIBS += softMotor
+WithMPFVx_LIBS   += motor
 
 # Support from IPAC R2.6 and above.
 WithMPFVx_LIBS 		+= Ipac TyGSOctal
diff --git a/motorExApp/WithAsyn/WithAsynInclude.dbd b/motorExApp/WithAsyn/WithAsynInclude.dbd
index 368fee4b..347c3e8e 100644
--- a/motorExApp/WithAsyn/WithAsynInclude.dbd
+++ b/motorExApp/WithAsyn/WithAsynInclude.dbd
@@ -6,7 +6,7 @@ include "drvAsynSerialPort.dbd"
 #include "devMclennanMotor.dbd"
 #include "devMicos.dbd"
 #include "devMicroMo.dbd"
-include "devNewport.dbd"
+#include "devNewport.dbd"
 #include "devPIMotor.dbd"
 #include "devSoftMotor.dbd"
 
diff --git a/motorExApp/WithAsyn/WithAsynVxInclude.dbd b/motorExApp/WithAsyn/WithAsynVxInclude.dbd
index f3349ed7..30b25d5d 100644
--- a/motorExApp/WithAsyn/WithAsynVxInclude.dbd
+++ b/motorExApp/WithAsyn/WithAsynVxInclude.dbd
@@ -6,7 +6,7 @@ include "drvAsynSerialPort.dbd"
 #include "devMclennanMotor.dbd"
 #include "devMicos.dbd"
 #include "devMicroMo.dbd"
-include "devNewport.dbd"
+#include "devNewport.dbd"
 #include "devPIMotor.dbd"
 #include "devSoftMotor.dbd"
 # Only for IPAC R2.7 and above.
diff --git a/motorExApp/WithAsyn/WithMPFInclude.dbd b/motorExApp/WithAsyn/WithMPFInclude.dbd
index 368fee4b..347c3e8e 100644
--- a/motorExApp/WithAsyn/WithMPFInclude.dbd
+++ b/motorExApp/WithAsyn/WithMPFInclude.dbd
@@ -6,7 +6,7 @@ include "drvAsynSerialPort.dbd"
 #include "devMclennanMotor.dbd"
 #include "devMicos.dbd"
 #include "devMicroMo.dbd"
-include "devNewport.dbd"
+#include "devNewport.dbd"
 #include "devPIMotor.dbd"
 #include "devSoftMotor.dbd"
 
diff --git a/motorExApp/WithAsyn/WithMPFVxInclude.dbd b/motorExApp/WithAsyn/WithMPFVxInclude.dbd
index f3349ed7..30b25d5d 100644
--- a/motorExApp/WithAsyn/WithMPFVxInclude.dbd
+++ b/motorExApp/WithAsyn/WithMPFVxInclude.dbd
@@ -6,7 +6,7 @@ include "drvAsynSerialPort.dbd"
 #include "devMclennanMotor.dbd"
 #include "devMicos.dbd"
 #include "devMicroMo.dbd"
-include "devNewport.dbd"
+#include "devNewport.dbd"
 #include "devPIMotor.dbd"
 #include "devSoftMotor.dbd"
 # Only for IPAC R2.7 and above.
diff --git a/motorExApp/WithMPF/Makefile b/motorExApp/WithMPF/Makefile
index ffaad3a8..1f563728 100644
--- a/motorExApp/WithMPF/Makefile
+++ b/motorExApp/WithMPF/Makefile
@@ -23,27 +23,27 @@ WithMPF_OBJS_vxWorks	+= $(EPICS_BASE_BIN)/vxComLibrary
 #!WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib
 #!WithMPFVx_OBJS_vxWorks   += $(IPAC_BIN)/tyGSOctal
 
-WithMPF_LIBS		+= Mclennan
-WithMPF_LIBS		+= Micos
-WithMPF_LIBS		+= MicroMo
-WithMPF_LIBS		+= PI
-WithMPF_LIBS		+= Acs
-WithMPF_LIBS		+= Ims
-WithMPF_LIBS		+= Newport
-WithMPF_LIBS		+= softMotor
-WithMPF_LIBS		+= motor
-WithMPF_LIBS		+= asyn
-WithMPF_LIBS 		+= $(EPICS_BASE_IOC_LIBS)
+#!WithMPF_LIBS   += Mclennan
+#!WithMPF_LIBS   += Micos
+#!WithMPF_LIBS   += MicroMo
+#!WithMPF_LIBS   += PI
+#!WithMPF_LIBS   += Acs
+#!WithMPF_LIBS   += Ims
+#!WithMPF_LIBS   += Newport
+#!WithMPF_LIBS   += softMotor
+WithMPF_LIBS     += motor
+WithMPF_LIBS     += asyn
+WithMPF_LIBS     += $(EPICS_BASE_IOC_LIBS)
 
-WithMPFVx_LIBS		+= Mclennan
-WithMPFVx_LIBS		+= Micos
-WithMPFVx_LIBS		+= MicroMo
-WithMPFVx_LIBS		+= PI
-WithMPFVx_LIBS		+= Acs
-WithMPFVx_LIBS		+= Ims
-WithMPFVx_LIBS		+= Newport
-WithMPFVx_LIBS		+= softMotor
-WithMPFVx_LIBS		+= motor
+#!WithMPFVx_LIBS += Mclennan
+#!WithMPFVx_LIBS += Micos
+#!WithMPFVx_LIBS += MicroMo
+#!WithMPFVx_LIBS += PI
+#!WithMPFVx_LIBS += Acs
+#!WithMPFVx_LIBS += Ims
+#!WithMPFVx_LIBS += Newport
+#!WithMPFVx_LIBS += softMotor
+WithMPFVx_LIBS   += motor
 
 # Support from IPAC R2.6 and above.
 WithMPFVx_LIBS 		+= Ipac TyGSOctal
diff --git a/motorExApp/WithMPF/WithMPFInclude.dbd b/motorExApp/WithMPF/WithMPFInclude.dbd
index 368fee4b..347c3e8e 100644
--- a/motorExApp/WithMPF/WithMPFInclude.dbd
+++ b/motorExApp/WithMPF/WithMPFInclude.dbd
@@ -6,7 +6,7 @@ include "drvAsynSerialPort.dbd"
 #include "devMclennanMotor.dbd"
 #include "devMicos.dbd"
 #include "devMicroMo.dbd"
-include "devNewport.dbd"
+#include "devNewport.dbd"
 #include "devPIMotor.dbd"
 #include "devSoftMotor.dbd"
 
diff --git a/motorExApp/WithMPF/WithMPFVxInclude.dbd b/motorExApp/WithMPF/WithMPFVxInclude.dbd
index f3349ed7..30b25d5d 100644
--- a/motorExApp/WithMPF/WithMPFVxInclude.dbd
+++ b/motorExApp/WithMPF/WithMPFVxInclude.dbd
@@ -6,7 +6,7 @@ include "drvAsynSerialPort.dbd"
 #include "devMclennanMotor.dbd"
 #include "devMicos.dbd"
 #include "devMicroMo.dbd"
-include "devNewport.dbd"
+#include "devNewport.dbd"
 #include "devPIMotor.dbd"
 #include "devSoftMotor.dbd"
 # Only for IPAC R2.7 and above.