diff --git a/iocBoot/iocxxx/common.iocsh b/iocBoot/iocxxx/common.iocsh
index 833c311e2bd294b74c1729b96e4d2df130dfa736..ac903827f06fc0fd7f1fe9fa23d260fe5f9dd693 100644
--- a/iocBoot/iocxxx/common.iocsh
+++ b/iocBoot/iocxxx/common.iocsh
@@ -17,7 +17,46 @@ epicsEnvSet("STREAM_PROTOCOL_PATH", ".")
 epicsEnvSet EPICS_CA_MAX_ARRAY_BYTES 64010
 
 ### save_restore setup
-< common/save_restore.cmd
+iocshLoad("$(AUTOSAVE)/iocsh/autosave_settings.iocsh", "PREFIX=$(PREFIX), SAVE_PATH=$(TOP)/iocBoot/$(IOC)")
+iocshLoad("$(AUTOSAVE)/iocsh/autosaveBuild.iocsh",     "PREFIX=$(PREFIX)")
+iocshLoad("$(AUTOSAVE)/iocsh/save_restore.iocsh",      "PREFIX=$(PREFIX), POSITIONS_FILE=auto_positions, SETTINGS_FILE=auto_settings")
+
+# Note that you can restore a .sav file without also autosaving to it.
+#set_pass0_restoreFile("octupole_settings.sav")
+#set_pass1_restoreFile("octupole_settings.sav")
+
+###
+# specify directories in which to search for included request files
+# Note that the vxWorks variables (e.g., 'startup') are from cdCommands
+set_requestfile_path("$(AREA_DETECTOR)", "ADApp/Db")
+set_requestfile_path("$(ADCORE)", "ADApp/Db")
+set_requestfile_path("$(AUTOSAVE)", "asApp/Db")
+set_requestfile_path("$(BUSY)", "busyApp/Db")
+set_requestfile_path("$(CALC)", "calcApp/Db")
+set_requestfile_path("$(CAMAC)", "camacApp/Db")
+set_requestfile_path("$(CAPUTRECORDER)", "caputRecorderApp/Db")
+set_requestfile_path("$(DAC128V)", "dac128VApp/Db")
+set_requestfile_path("$(DELAYGEN)", "delaygenApp/Db")
+set_requestfile_path("$(DXP)", "dxpApp/Db")
+set_requestfile_path("$(IP)", "ipApp/Db")
+set_requestfile_path("$(IP330)", "ip330App/Db")
+set_requestfile_path("$(IPUNIDIG)", "ipUnidigApp/Db")
+set_requestfile_path("$(LOVE)", "loveApp/Db")
+set_requestfile_path("$(MCA)", "mcaApp/Db")
+set_requestfile_path("$(MEASCOMP)", "measCompApp/Db")
+set_requestfile_path("$(MODBUS)", "modbusApp/Db")
+set_requestfile_path("$(MOTOR)", "motorApp/Db")
+set_requestfile_path("$(OPTICS)", "opticsApp/Db")
+set_requestfile_path("$(QUADEM)", "quadEMApp/Db")
+set_requestfile_path("$(SSCAN)", "sscanApp/Db")
+set_requestfile_path("$(SOFTGLUE)", "softGlueApp/Db")
+set_requestfile_path("$(STD)", "stdApp/Db")
+set_requestfile_path("$(VAC)", "vacApp/Db")
+set_requestfile_path("$(VME)", "vmeApp/Db")
+set_requestfile_path("$(TOP)", "xxxApp/Db")
+
+# Debug-output level
+save_restoreSet_Debug(0)
 
 # Access Security
 dbLoadRecords("$(TOP)/xxxApp/Db/Security_Control.db","P=$(PREFIX)")
@@ -27,25 +66,6 @@ asSetSubstitutions("P=$(PREFIX)")
 ### caputRecorder
 iocshLoad("$(CAPUTRECORDER)/iocsh/caputRecorder.iocsh", "PREFIX=$(PREFIX)")
 
-# user-assignable ramp/tweak
-dbLoadRecords("$(STD)/stdApp/Db/ramp_tweak.db","P=$(PREFIX),Q=rt1")
-
-# < $(PLATFORM)/areaDetector.cmd
-
-# Motors
-dbLoadTemplate("substitutions/motor.substitutions", "P=$(PREFIX)")
-#dbLoadTemplate("substitutions/softMotor.substitutions", "P=$(PREFIX)")
-#dbLoadTemplate("substitutions/pseudoMotor.substitutions", "P=$(PREFIX)")
-
-# Allstop, alldone
-iocshLoad("$(MOTOR)/iocsh/allstop.iocsh", "P=$(PREFIX)")
-
-### streamDevice example
-#dbLoadRecords("$(TOP)/xxxApp/Db/streamExample.db","P=$(PREFIX),PORT=serial1")
-
-### Insertion-device control
-#dbLoadRecords("$(STD)/stdApp/Db/IDctrl.db","P=$(PREFIX),xx=02us")
-
 ### Scan-support software
 iocshLoad("$(SSCAN)/iocsh/sscan.iocsh", "PREFIX=$(PREFIX), MAX_PTS=1000, REQ_FILE=saveData.req")
 iocshLoad("$(AUTOSAVE)/iocsh/configMenu.iocsh", "PREFIX=$(PREFIX),CONFIG=scan1")
@@ -57,53 +77,25 @@ iocshLoad("$(AUTOSAVE)/iocsh/configMenu.iocsh", "PREFIX=$(PREFIX),CONFIG=scan1")
 # crate.
 dbLoadTemplate("$(PLATFORM)/scanParms.substitutions")
 
+### Stuff for user programming ###
+iocshLoad("$(CALC)/iocsh/userCalc.iocsh", "PREFIX=$(PREFIX), ARRAY_SIZE=8000")
 
-# Load single element Canberra AIM MCA and ICB modules
-#< $(PLATFORM)/canberra_1.cmd
-
-# Load 13 element detector software
-#< $(PLATFORM)/canberra_13.cmd
-
-# Load 3 element detector software
-#< $(PLATFORM)/canberra_3.cmd
-
-< common/optics.iocsh
-
-< common/calc.iocsh
-
-# Soft scaler for testing
-#iocshLoad("$(STD)/iocsh/softScaler.iocsh", "P=$(PREFIX), INSTANCE=scaler1")
-
-# 4-step measurement
-dbLoadRecords("$(STD)/stdApp/Db/4step.db", "P=$(PREFIX),Q=4step:")
-
-# user-assignable ramp/tweak
-dbLoadRecords("$(STD)/stdApp/Db/ramp_tweak.db","P=$(PREFIX),Q=rt1")
-
-# pvHistory (in-crate archive of up to three PV's)
-dbLoadRecords("$(STD)/stdApp/Db/pvHistory.db","P=$(PREFIX),N=1,MAXSAMPLES=1440")
-
-# software timer
-dbLoadRecords("$(STD)/stdApp/Db/timer.db","P=$(PREFIX),N=1")
-
-# Slow feedback
-#dbLoadTemplate("substitutions/pid_slow.substitutions")
-#dbLoadTemplate("substitutions/async_pid_slow.substitutions")
-#dbLoadTemplate("substitutions/fb_epid.substitutions")
+# Load 10 more of all the user calcs, N=1 creates usercalcs 10-19
+iocshLoad("$(CALC)/iocsh/userCalc_extra.iocsh", "PREFIX=$(PREFIX), N=1, ARRAY_SIZE=8000")
 
-# Miscellaneous PV's, such as burtResult
-dbLoadRecords("$(STD)/stdApp/Db/misc.db","P=$(PREFIX)")
+# string sequence (sseq) records
+iocshLoad("$(CALC)/iocsh/sseq.iocsh", "PREFIX=$(PREFIX), INSTANCE=ES:")
 
-### Queensgate Nano2k piezo controller
-#dbLoadRecords("$(STD)/stdApp/Db/Nano2k.db","P=$(PREFIX),S=s1")
+# interpolation
+dbLoadRecords("$(CALC)/calcApp/Db/interp.db", "P=$(PREFIX),N=2000")
+dbLoadRecords("$(CALC)/calcApp/Db/interpNew.db", "P=$(PREFIX),Q=1,N=2000")
 
-### Load database records for Femto amplifiers
-#epicsEnvSet("FBO", "$(PREFIX)Unidig1Bo")
-#iocshLoad("$(STD)/iocsh/femto.iocsh", "PREFIX=$(PREFIX), HARDWARE=fem01:, FUNC=seq01:, G1_PV=$(FBO)6, G2_PV=$(FBO)7, G3_PV=$(FBO)8, NO_PV=$(FBO)10")
+# busy record
+dbLoadRecords("$(BUSY)/busyApp/Db/busyRecord.db", "P=$(PREFIX),R=mybusy1")
+dbLoadRecords("$(BUSY)/busyApp/Db/busyRecord.db", "P=$(PREFIX),R=mybusy2")
 
-# trajectory scan
-#dbLoadRecords("$(MOTOR)/motorApp/Db/trajectoryScan.db","P=$(PREFIX),R=traj1:,NAXES=2,NELM=300,NPULSE=300")
-#doAfterIocInit("seq &MAX_trajectoryScan, 'P=$(PREFIX),R=traj1:,M1=m1,M2=m2,M3=m3,M4=m4,M5=m5,M6=m6,M7=m7,M8=m8,PORT=none'")
+# Soft function generator
+#dbLoadRecords("$(CALC)/calcApp/Db/FuncGen.db","P=$(PREFIX),Q=fgen,OUT=$(PREFIX)m7.VAL")
 
 ### Load database record for alive heartbeating support.
 # RHOST specifies the IP address that receives the heartbeats.
diff --git a/iocBoot/iocxxx/common/calc.iocsh b/iocBoot/iocxxx/common/calc.iocsh
deleted file mode 100644
index 88212bdd0226121bc45fb02280e230f195d4e65a..0000000000000000000000000000000000000000
--- a/iocBoot/iocxxx/common/calc.iocsh
+++ /dev/null
@@ -1,19 +0,0 @@
-### Stuff for user programming ###
-iocshLoad("$(CALC)/iocsh/userCalc.iocsh", "PREFIX=$(PREFIX), ARRAY_SIZE=8000")
-
-# Load 10 more of all the user calcs, N=1 creates usercalcs 10-19
-iocshLoad("$(CALC)/iocsh/userCalc_extra.iocsh", "PREFIX=$(PREFIX), N=1, ARRAY_SIZE=8000")
-
-# string sequence (sseq) records
-iocshLoad("$(CALC)/iocsh/sseq.iocsh", "PREFIX=$(PREFIX), INSTANCE=ES:")
-
-# interpolation
-dbLoadRecords("$(CALC)/calcApp/Db/interp.db", "P=$(PREFIX),N=2000")
-dbLoadRecords("$(CALC)/calcApp/Db/interpNew.db", "P=$(PREFIX),Q=1,N=2000")
-
-# busy record
-dbLoadRecords("$(BUSY)/busyApp/Db/busyRecord.db", "P=$(PREFIX),R=mybusy1")
-dbLoadRecords("$(BUSY)/busyApp/Db/busyRecord.db", "P=$(PREFIX),R=mybusy2")
-
-# Soft function generator
-#dbLoadRecords("$(CALC)/calcApp/Db/FuncGen.db","P=$(PREFIX),Q=fgen,OUT=$(PREFIX)m7.VAL")
diff --git a/iocBoot/iocxxx/common/save_restore.cmd b/iocBoot/iocxxx/common/save_restore.cmd
deleted file mode 100644
index d8af0d75f08293b3287dd482aa0b8eef4a2053fc..0000000000000000000000000000000000000000
--- a/iocBoot/iocxxx/common/save_restore.cmd
+++ /dev/null
@@ -1,55 +0,0 @@
-
-# BEGIN save_restore.cmd ------------------------------------------------------
-
-# This file does not require modification for standard use
-# If you want save_restore to manage its own NFS mount, specify the name and
-# IP address of the file server to which save files should be written, and
-# set SAVE_PATH to a path as the server sees it.  This currently
-# is supported only on vxWorks.
-
-#save_restoreSet_NFSHost("oxygen", "164.54.22.10")
-
-iocshLoad("$(AUTOSAVE)/iocsh/autosave_settings.iocsh", "PREFIX=$(PREFIX), SAVE_PATH=$(TOP)/iocBoot/$(IOC)")
-iocshLoad("$(AUTOSAVE)/iocsh/autosaveBuild.iocsh",     "PREFIX=$(PREFIX)")
-iocshLoad("$(AUTOSAVE)/iocsh/save_restore.iocsh",      "PREFIX=$(PREFIX), POSITIONS_FILE=auto_positions, SETTINGS_FILE=auto_settings")
-
-# Note that you can restore a .sav file without also autosaving to it.
-#set_pass0_restoreFile("octupole_settings.sav")
-#set_pass1_restoreFile("octupole_settings.sav")
-
-###
-# specify directories in which to search for included request files
-# Note that the vxWorks variables (e.g., 'startup') are from cdCommands
-set_requestfile_path("$(TOP)/iocBoot/$(IOC)/$(PLATFORM)", "")
-set_requestfile_path("$(TOP)/iocBoot/$(IOC)/common", "")
-set_requestfile_path("$(AREA_DETECTOR)", "ADApp/Db")
-set_requestfile_path("$(ADCORE)", "ADApp/Db")
-set_requestfile_path("$(AUTOSAVE)", "asApp/Db")
-set_requestfile_path("$(BUSY)", "busyApp/Db")
-set_requestfile_path("$(CALC)", "calcApp/Db")
-set_requestfile_path("$(CAMAC)", "camacApp/Db")
-set_requestfile_path("$(CAPUTRECORDER)", "caputRecorderApp/Db")
-set_requestfile_path("$(DAC128V)", "dac128VApp/Db")
-set_requestfile_path("$(DELAYGEN)", "delaygenApp/Db")
-set_requestfile_path("$(DXP)", "dxpApp/Db")
-set_requestfile_path("$(IP)", "ipApp/Db")
-set_requestfile_path("$(IP330)", "ip330App/Db")
-set_requestfile_path("$(IPUNIDIG)", "ipUnidigApp/Db")
-set_requestfile_path("$(LOVE)", "loveApp/Db")
-set_requestfile_path("$(MCA)", "mcaApp/Db")
-set_requestfile_path("$(MEASCOMP)", "measCompApp/Db")
-set_requestfile_path("$(MODBUS)", "modbusApp/Db")
-set_requestfile_path("$(MOTOR)", "motorApp/Db")
-set_requestfile_path("$(OPTICS)", "opticsApp/Db")
-set_requestfile_path("$(QUADEM)", "quadEMApp/Db")
-set_requestfile_path("$(SSCAN)", "sscanApp/Db")
-set_requestfile_path("$(SOFTGLUE)", "softGlueApp/Db")
-set_requestfile_path("$(STD)", "stdApp/Db")
-set_requestfile_path("$(VAC)", "vacApp/Db")
-set_requestfile_path("$(VME)", "vmeApp/Db")
-set_requestfile_path("$(TOP)", "xxxApp/Db")
-
-# Debug-output level
-save_restoreSet_Debug(0)
-
-# END save_restore.cmd --------------------------------------------------------
diff --git a/iocBoot/iocxxx/st.cmd.Cygwin b/iocBoot/iocxxx/st.cmd.Cygwin
index fa19fedb69ebab0cd263fdbbbdd5fc9a6106f34a..bbf39bccf7ffca4796f935f65d1143a2fa928d1a 100644
--- a/iocBoot/iocxxx/st.cmd.Cygwin
+++ b/iocBoot/iocxxx/st.cmd.Cygwin
@@ -15,11 +15,6 @@ epicsEnvSet("PLATFORM", "softioc")
 
 < common.iocsh
 
-# < $(PLATFORM)/areaDetector.cmd
-# < $(PLATFORM)/serial.cmd
-
-< common/motorSim.cmd
-
 # devIocStats
 dbLoadRecords("$(DEVIOCSTATS)/db/ioc.db","IOCNAME=xxx, TODFORMAT=%m/%d/%Y %H:%M:%S")
 
diff --git a/iocBoot/iocxxx/st.cmd.Linux b/iocBoot/iocxxx/st.cmd.Linux
index 12014b7dd0434c3af10869d8e87c6919da49d06b..46e4edad0313ef00b42f539881372cfe26af3ae6 100644
--- a/iocBoot/iocxxx/st.cmd.Linux
+++ b/iocBoot/iocxxx/st.cmd.Linux
@@ -15,10 +15,6 @@ epicsEnvSet("PLATFORM", "softioc")
 
 < common.iocsh
 
-# < $(PLATFORM)/serial.cmd
-
-< common/motorSim.cmd
-
 # devIocStats
 dbLoadRecords("$(DEVIOCSTATS)/db/iocAdminSoft.db","IOC=xxx")
 
diff --git a/iocBoot/iocxxx/st.cmd.Win32 b/iocBoot/iocxxx/st.cmd.Win32
index 001fddf206afe54b15680c4e2eb3f50cc6373431..8bbf50664c744ec4bab13b681444ecc5eb7180c6 100644
--- a/iocBoot/iocxxx/st.cmd.Win32
+++ b/iocBoot/iocxxx/st.cmd.Win32
@@ -15,10 +15,6 @@ epicsEnvSet("PLATFORM", "softioc")
 
 < common.iocsh
 
-# < $(PLATFORM)/serial.cmd
-
-< common/motorSim.cmd
-
 # devIocStats
 dbLoadRecords("$(DEVIOCSTATS)/db/iocAdminSoft.db","IOC=xxx")
 
diff --git a/iocBoot/iocxxx/st.cmd.vxWorks b/iocBoot/iocxxx/st.cmd.vxWorks
index 2c96b1b68164dfb2241f97ad662249b49d8e9612..b1c092c869cc479358028e624a6c5efe3718d598 100644
--- a/iocBoot/iocxxx/st.cmd.vxWorks
+++ b/iocBoot/iocxxx/st.cmd.vxWorks
@@ -41,20 +41,19 @@ iocxxxVX_registerRecordDeviceDriver(pdbbase)
 shellPromptSet "iocvxWorks> "
 iocLogDisable=0
 
-iocsh 
+# If you want save_restore to manage its own NFS mount, specify the name and
+# IP address of the file server to which save files should be written, and
+# set SAVE_PATH to a path as the server sees it.  This currently
+# is supported only on vxWorks.
 
-epicsEnvSet("PLATFORM", "vxWorks")
+#save_restoreSet_NFSHost("oxygen", "164.54.22.10")
 
-< common.iocsh
 
-# Industry Pack support
-< $(PLATFORM)/industryPack.cmd
+iocsh 
 
-# VME devices
-< $(PLATFORM)/vme.cmd
+epicsEnvSet("PLATFORM", "vxWorks")
 
-# CAMAC hardware
-#< $(PLATFORM)/camac.cmd
+< common.iocsh
 
 # devIocStats
 dbLoadRecords("$(DEVIOCSTATS)/db/iocAdminVxWorks.db","IOC=xxx")