diff --git a/src/epics/util/feCodeGen.pl b/src/epics/util/feCodeGen.pl
index a80971af81b8d298f040054f36319bdccc17a043..d910d02ba3dde0e7728e01c40cbdfc738dece0ad 100755
--- a/src/epics/util/feCodeGen.pl
+++ b/src/epics/util/feCodeGen.pl
@@ -2836,7 +2836,7 @@ if ($dac_internal_clocking) {
   print OUTM "CFLAGS += -DDAC_INTERNAL_CLOCKING\n";
 }
 if ($adcMaster > -1) {
-  print OUTM "CFLAGS += -DADC_MASTER\n";
+  #print OUTM "CFLAGS += -DADC_MASTER\n";
   $modelType = "MASTER";
   if($diagTest > -1) {
   print OUTM "CFLAGS += -DDIAG_TEST\n";
@@ -2888,9 +2888,11 @@ if ($flipSignals) {
   print OUTM "CFLAGS += -DFLIP_SIGNALS=1\n";
 }
 
+if ($pciNet > 0) {
 print OUTM "#Enable use of PCIe RFM Network Gen 2\n";
 print OUTM "DOLPHIN_PATH = /opt/srcdis\n";
 print OUTM "CFLAGS += -DHAVE_CONFIG_H -I\$(DOLPHIN_PATH)/src/include/dis -I\$(DOLPHIN_PATH)/src/include -I\$(DOLPHIN_PATH)/src/SISCI/cmd/test/lib -I\$(DOLPHIN_PATH)/src/SISCI/src -I\$(DOLPHIN_PATH)/src/SISCI/api -I\$(DOLPHIN_PATH)/src/SISCI/cmd/include -I\$(DOLPHIN_PATH)/src/IRM_GX/drv/src -I\$(DOLPHIN_PATH)/src/IRM_GX/drv/src/LINUX -DOS_IS_LINUX=196616 -DLINUX -DUNIX  -DLITTLE_ENDIAN -DDIS_LITTLE_ENDIAN -DCPU_WORD_IS_64_BIT -DCPU_ADDR_IS_64_BIT -DCPU_WORD_SIZE=64 -DCPU_ADDR_SIZE=64 -DCPU_ARCH_IS_X86_64 -DADAPTER_IS_IX   -m64 -D_REENTRANT\n";
+}
 
 if ($specificCpu > -1) {
   print OUTM "#Comment out to run on first available CPU\n";
@@ -2953,7 +2955,11 @@ print OUTM "\n";
 print OUTM "\n";
 
 print OUTM "CFLAGS += -I\$(SUBDIRS)/../../include -I$rcg_src_dir\/src/drv -I$rcg_src_dir\/src/include \n";
+if ($pciNet > 0) {
 print OUTM "LDFLAGS = -L \$(API_LIB_PATH) -lsisci\n";
+} else {
+print OUTM "LDFLAGS = -L \$(API_LIB_PATH) \n";
+}
 
 print OUTM "TARGET=$skeleton\n\n\n";
 print OUTM "$skeleton: $skeleton.o rfm.o \n\n";
diff --git a/src/fe/controllerAppUser.c b/src/fe/controllerAppUser.c
index 8cb9a6477567f544a0f882825c2577927153bd24..5280f1248493746b60331c39f55878432fdfaadb 100644
--- a/src/fe/controllerAppUser.c
+++ b/src/fe/controllerAppUser.c
@@ -59,7 +59,7 @@ int dacOF[ MAX_DAC_MODULES ];
 #include "drv/inputFilterModule1.h"
 #include <drv/app_dac_functions.c>
 
-#include "dolphin_usp.c"
+// #include "dolphin_usp.c"
 
 #define BILLION 1000000000L
 
diff --git a/src/fe/moduleLoadCommon.c b/src/fe/moduleLoadCommon.c
index 5c953bf71b501c27c2491f12ccdc3aa4a422fcd5..05d25479c5b88ac77f662c24ccb804cd55b46920 100644
--- a/src/fe/moduleLoadCommon.c
+++ b/src/fe/moduleLoadCommon.c
@@ -198,6 +198,7 @@ print_exit_messages(int error_type, int error_sub)
     }
 }
 
+#ifndef USER_SPACE
 int attach_shared_memory()
 {
 int ret;
@@ -240,3 +241,4 @@ char fname[ 128 ];
 
     return 0;
 }
+#endif
diff --git a/src/fe/rcguser.c b/src/fe/rcguser.c
index 26c8201b27f81a1696b91ba3ea58b157a3bdf78d..7b22bfb21e584d1e2648646e0f223f091d9c29ab 100644
--- a/src/fe/rcguser.c
+++ b/src/fe/rcguser.c
@@ -392,10 +392,12 @@ main( int argc, char** argv )
     // Slave gets RFM module count from MASTER.
     cdsPciModules.rfmCount = ioMemData->rfmCount;
     cdsPciModules.dolphinCount = ioMemData->dolphinCount;
+#if 0
     if(cdsPciModules.dolphinCount)
     {
         dolphin_init(&cdsPciModules);
     }
+#endif
     for ( ii = 0; ii < cdsPciModules.rfmCount; ii++ )
     {
         cdsPciModules.pci_rfm[ ii ] = ioMemData->pci_rfm[ ii ];