diff --git a/beckhoffApp/Db/Makefile b/beckhoffApp/Db/Makefile
index 840b4a5..a171063 100644
--- a/beckhoffApp/Db/Makefile
+++ b/beckhoffApp/Db/Makefile
@@ -15,6 +15,7 @@ DB += single_axis_tc.db
 DB += desc_tc.db
 DB += frozen_offsets.db
 DB += autoonoff.db
+DB += units_tc.db
 
 #----------------------------------------------------
 # If <anyname>.db template is not named <anyname>*.template add
diff --git a/beckhoffApp/Db/units_tc.substitutions b/beckhoffApp/Db/units_tc.substitutions
new file mode 100644
index 0000000..e2ba325
--- /dev/null
+++ b/beckhoffApp/Db/units_tc.substitutions
@@ -0,0 +1,4 @@
+file "$(TOP)/beckhoffApp/beckhoff_read_pv.template" {
+    pattern {P, NAME, PORT, ADSPORT, V, RECTYPE, EPICSDTYP, ADS_TYPE}
+    {"\$(P)", "ASTAXES_\$(AXIS_NUM):STDESC-SUNITS", "\$(PORT)", "\$(ADSPORT)", "GVL.astAxes[\$(AXIS_NUM)].stDescription.sUnits", stringin, "asynOctetRead", "STRING N=32"}
+}
diff --git a/settings/IMAT/galil/README_galil_cmd.txt b/settings/IMAT/galil/README_galil_cmd.txt
deleted file mode 100644
index 1dff9bc..0000000
--- a/settings/IMAT/galil/README_galil_cmd.txt
+++ /dev/null
@@ -1,131 +0,0 @@
-# In the G21X3Config command, the parameters are:
-#
-#    int   card number, counting from 0
-#    char* ip address, or card location (eg. ASDMC01, 192.6.94.5, /dev/galilpci0, /dev/ttyS0 19200, GALILPCI1)
-# ISIS change: COM port specified as e.g. "COM16 115200" on either Linux or windows
-#    int   totalaxis used
-#    int   model number from this list:
-#				  0
-#				  100
-#				  200
-#				  600
-#				  700
-#				  1000
-#				  1200
-#				  1410
-#				  1411
-#				  1412
-#				  1415
-#				  1417
-#				  1500
-#				  1600
-#				  1700
-#				  1800
-#				  1802
-#				  2000
-#				  2100
-#    int   communications timeout in ms
-
-#G21X3Config(0,"130.246.51.169",8,2100,2000)
-G21X3Config(0,"COM1 115200",8,2100,2000)
-
-# In the G21X3NameConfig command, the parameters are:
-#
-#    int   cardnumber starting from 0 
-#    char  axis A-H,
-#    int   motortype, has the following values:
-#
-#           	0 is a servo motor
-#           	1 is a reversed polarity servo motor
-#           	2 is a high active pulse stepper
-#          	3 is a low active pulse stepper
-#           	4 is a reverse high active pulse stepper
-#           	5 is a reverse low active pulse stepper
-#
-#    int   Invert axis coordinates.  Makes -ve coordinate space +ve and vice versa.  Bit 0 = invert motor, Bit 1 = Invert Encoder, Bit 2 = Invert Position Maintenance, Bit 3 = Swap limits
-#    int   mainencoder (-1 off, other see manual)),
-#    int   auxencoder (-1 off, other see manual), 
-#    int   ssiencoderinput (0 off, 1 main enc reg, 2 aux enc reg), 
-#    int   limits_as_home (0 off 1 on), 
-#    char* slave axis, is of format "B=1.0000,1,uencB=usrVarB,0.00025,0,uencValidVar,C=-.0250,0,uencC=usrVarC,0.00025,0,uencValidVar"
-#			      		 "B=1.0000,1, , , , ,C=-.0250,0" - No user encoder for slaves
-#			     		 "" no slave
-#
-#           	That is: axis=gearratio,homeallowed,uenc[Axis]=[expression],ueres,ueoff, uencValidVar, repeat till end of list
-#									    (usr encoder resolution)
-#									 	  (user encoder offset)
-#										         (user encoder reading valid flag 1=valid)
-#		
-#	    	Where uenc[Axis] is the user encoder input location for [Axis] as specified by
-#	    	the [expression].  The uenc[Axis] string actually ends up as Galil code, on the controller.
-#	    	If uenc[Axis] is not specified and stepper position maintenance is on, the code generator will
-#	   	produce code based on your encoder type (eg. quadrature, SSI, Inverted SSI, etc).  This is an
-#	    	advanced setting, and it is not normally specified.  Examples are 3 IVU devices with 2 motors each
-#	    	with two SSI encoders, and 1 APS type wiggler with two motors, 2 SSI encoders and two digital interface
-#	    	"user" encoders known as gurley virtual absolute encoders.  User encoder relies on user code specified
-#           	in G21X3StartCard code file to provide user encoder validation sequence (optional), to set the user encoder
-#           	valid flag (uencValidVar, mandatory), and to provide the encoder readback in 
-#           	the specified [expression] (mandatory).  The encoder units in [expression] must be raw counts
-#           	In user code IF (uencv[Axis] = 1) is used to define the user encoder validation sequence (optional).  
-#	    	PV's are:
-#           	$(P):$(M)_UEVALIDATE_CMD. Will set uencv[Axis] = 1.  Triggers user provided validation process
-#           	$(P):$(M)_UESTATE_CMD.    Requests user encoder state on/off (on may be denied, if not valid)
-#           	$(P):$(M)_UESTATE_STATUS. Readback for user encoder state (on/off)
-#           	$(P):$(M)_UEVALID_STATUS. User encoder reading valid status
-#           	$(P):$(M)_UERAW_MONITOR.  User encoder raw counts
-#           	$(P):$(M)_UEDIAL_MONITOR. User encoder dial reading (raw * ueres)
-#	    	$(P):$(M)_UEUSER_MONITOR. User encoder user reading (raw * ueres) + ueoff
-#
-#           	$(P):$(M)_NERAW_MONITOR.  Native encoder raw counts
-#           	$(P):$(M)_NEDIAL_MONITOR. Native encoder dial reading (raw * ueres)
-#	    	$(P):$(M)_NEUSER_MONITOR. Native encoder user reading (raw * ueres) + ueoff
-#
-#
-#           Always specify last axis last.
-#
-#           homeallowed is only for system setup purposes, where master and slave are not tightly coupled.  Home allowed is good for homming a
-#           slave after the master home is completed.
-#
-#    int   slave cmd (0 master cmd, 1 master encoder),
-#    int   gantrymode (0 off 1 on), 
-#		0 Off - applications where master/slave are not tightly/mechanically coupled
-#			Limit activation on slave during coupled move will result in slave reverting to independant mode
-#			Limit activation on master or slave during independant move results in motor stop only
-#		1 On  - applications where master/slave are tightly/mechanically coupled.
-#			Limit activation on slave during coupled move will result in master stop
-#			Limit activation on master or slave during independant move results in motor stop only
-#
-#    char* EPS digital home/Motor Interlock Port
-#		EPS digital home (0 or "" is off 1-8 nominates port.) 
-#		Motor interlock digital port number if -1 to -8 eg. "-1,-2,-4"
-#
-#    int   EPS digital away/Interlock switch type (Function depends on EPS digital home/Motor Interlock Port value specified.. above)
-#               EPS digital away (0 off 1-8 nominates port.  Single int)
-#		Interlock switch type 0 normally open, all other values is normally closed interlock switch type
-# 
-#    char* stepper position maintenance
-#		0 off
-#		1 on and uses standard encoder settings, and code generator output, or
-#		"invalid string" on and uses standard encoder settings, and code generator output
-#		"uenc[Axis]=[expression], ueres, ueoff, uencValidVar" on and uses user defined encoder location.  Same format as used for slave definition, see above.
-
-G21X3NameConfig(0,"A",3,0,-1,-1,0,1,"",0,0,"",1,0)
-G21X3NameConfig(0,"B",3,0,-1,-1,0,1,"",0,0,"",1,0)
-G21X3NameConfig(0,"C",3,0,-1,-1,0,1,"",0,0,"",1,0)
-G21X3NameConfig(0,"D",3,0,-1,-1,0,1,"",0,0,"",1,0)
-G21X3NameConfig(0,"E",0,0,0,0,0,1,"",0,0,"",1,0)
-G21X3NameConfig(0,"F",0,0,0,0,0,1,"",0,0,"",1,0)
-G21X3NameConfig(0,"G",0,0,0,0,0,1,"",0,0,"",1,0)
-G21X3NameConfig(0,"H",0,0,0,0,0,1,"",0,0,"",1,0)
-
-# In the G21X3StartCard command, the parameters are:
-#
-#    int   card number starting from 0
-#    char* code file to deliver to the card we are starting "" = use generated code
-#    int   Burn to EEPROM conditions
-#             0 = transfer code if differs from eeprom, dont burn code to eeprom, execute/restart code.
-#             1 = transfer code if differs from eeprom, burn code to eeprom, execute/restart code.
-#
-#    int   display code. Bit 1 displays generated code and or the code file code, Bit 2 displays uploaded code
-
-G21X3StartCard(0,"",1,0)
diff --git a/settings/IMAT/galil/axes.cmd b/settings/IMAT/galil/axes.cmd
deleted file mode 100644
index a1e0f2e..0000000
--- a/settings/IMAT/galil/axes.cmd
+++ /dev/null
@@ -1,27 +0,0 @@
-#$(IFIOC_GALIL_04) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=BENCH:ROT,mAXIS=MTR0401")
-
-#$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:X,mAXIS=MTR0501")
-#$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:Y,mAXIS=MTR0502")
-#$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:ZHI,mAXIS=MTR0503")
-#$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:THETA,mAXIS=MTR0504")
-#$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:PSI,mAXIS=MTR0505")
-#$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:CHI,mAXIS=MTR0506")
-#$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:ZLO,mAXIS=MTR0507")
-#
-
-# Deprecated axes left in for backward compatiblity
-$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:PHI,mAXIS=MTR0502")
-$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:CHI,mAXIS=MTR0503")
-
-# Actual axes
-$(IFIOC_GALIL_01) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=PINHOLE,mAXIS=MTR0101")
-
-$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:PHI1,mAXIS=MTR0502")
-$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:PHI2,mAXIS=MTR0503")
-$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:THETA,mAXIS=MTR0504")
-$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:X,mAXIS=MTR0505")
-$(IFIOC_GALIL_05) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:Y,mAXIS=MTR0506")
-
-#
-
-$(IFIOC_GALIL_04) dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=M9,mAXIS=MTR0406")
diff --git a/settings/IMAT/galil/galil01.cmd b/settings/IMAT/galil/galil01.cmd
deleted file mode 100644
index a2ea23b..0000000
--- a/settings/IMAT/galil/galil01.cmd
+++ /dev/null
@@ -1,31 +0,0 @@
-## configure galil crate 1
-
-## passed parameters
-##   GCID - galil crate software index. Numbering starts at 0 - will always be 0 if there is one to one galil crate <-> galil IOC mapping
-##   GALILADDR - address of this galil
-
-## see README_galil_cmd.txt for usage of commands below
-
-#G21X3Config($(GCID),"$(GALILADDR)",8,2100,2000)
-GalilCreateController("Galil", "$(GALILADDR)", -20)
-
-#G21X3NameConfig($(GCID),"A",0,0,0,0,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"B",0,0,0,0,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"C",0,0,0,0,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"D",0,0,0,0,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"E",0,0,0,0,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"F",0,0,0,0,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"G",0,0,0,0,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"H",0,0,0,0,0,0,"",0,0,"",1,0)
-GalilCreateAxis("Galil","A",0,"",1)
-GalilCreateAxis("Galil","B",0,"",1)
-GalilCreateAxis("Galil","C",0,"",1)
-GalilCreateAxis("Galil","D",0,"",1)
-GalilCreateAxis("Galil","E",0,"",1)
-GalilCreateAxis("Galil","F",0,"",1)
-GalilCreateAxis("Galil","G",0,"",1)
-GalilCreateAxis("Galil","H",0,"",1)
-
-#GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_Pin_Hole_Selector.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc",0,0,3)
-GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_Thread.gmc!$(GALIL)/gmc/galil_Home_RevLimit.gmc!$(GALIL)/gmc/galil_Home_RevLimit.gmc!$(GALIL)/gmc/galil_Home_Home.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc!$(GALIL)/gmc/galil_Home_Pin_Hole_Selector.gmc",0,0,3)
-
diff --git a/settings/IMAT/galil/galil02.cmd b/settings/IMAT/galil/galil02.cmd
deleted file mode 100644
index f7a6f33..0000000
--- a/settings/IMAT/galil/galil02.cmd
+++ /dev/null
@@ -1,31 +0,0 @@
-## configure galil crate 2
-
-## passed parameters
-##   GCID - galil crate software index. Numbering starts at 0 - will always be 0 if there is one to one galil crate <-> galil IOC mapping
-##   GALILADDR - address of this galil
-
-## see README_galil_cmd.txt for usage of commands below
-
-#G21X3Config($(GCID),"$(GALILADDR)",8,2100,2000)
-GalilCreateController("Galil", "$(GALILADDR)", 20)
-
-#G21X3NameConfig($(GCID),"A",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"B",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"C",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"D",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"E",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"F",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"G",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"H",0,0,0,0,0,1,"",0,0,"",1,0)
-GalilCreateAxis("Galil","A",1,"",1)
-GalilCreateAxis("Galil","B",1,"",1)
-GalilCreateAxis("Galil","C",1,"",1)
-GalilCreateAxis("Galil","D",1,"",1)
-GalilCreateAxis("Galil","E",1,"",1)
-GalilCreateAxis("Galil","F",1,"",1)
-GalilCreateAxis("Galil","G",1,"",1)
-GalilCreateAxis("Galil","H",1,"",1)
-
-#G21X3StartCard($(GCID),"$(GALIL)/db/galil_Default_Header.gmc;$(GALIL)/db/galil_Piezo_Home.gmc!$(GALIL)/db/galil_Piezo_Home.gmc!$(GALIL)/db/galil_Piezo_Home.gmc!$(GALIL)/db/galil_Piezo_Home.gmc!$(GALIL)/db/galil_Home_ForwLimit.gmc!$(GALIL)/db/galil_Home_ForwLimit.gmc!$(GALIL)/db/galil_Home_ForwLimit.gmc!$(GALIL)/db/galil_Home_ForwLimit.gmc;$(GALIL)/db/galil_Default_Footer.gmc",0,0)
-#GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc",0,0,3)
-GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc",0,0,3)
diff --git a/settings/IMAT/galil/galil03.cmd b/settings/IMAT/galil/galil03.cmd
deleted file mode 100644
index 735649e..0000000
--- a/settings/IMAT/galil/galil03.cmd
+++ /dev/null
@@ -1,31 +0,0 @@
-## configure galil crate 3
-
-## passed parameters
-##   GCID - galil crate software index. Numbering starts at 0 - will always be 0 if there is one to one galil crate <-> galil IOC mapping
-##   GALILADDR - address of this galil
-
-## see README_galil_cmd.txt for usage of commands below
-
-#G21X3Config($(GCID),"$(GALILADDR)",8,2100,2000)
-GalilCreateController("Galil", "$(GALILADDR)", 20)
-
-#G21X3NameConfig($(GCID),"A",3,0,-1,-1,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"B",3,0,-1,-1,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"C",3,0,-1,-1,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"D",3,0,-1,-1,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"E",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"F",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"G",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"H",0,0,0,0,0,1,"",0,0,"",1,0)
-GalilCreateAxis("Galil","A",1,"",1)
-GalilCreateAxis("Galil","B",1,"",1)
-GalilCreateAxis("Galil","C",1,"",1)
-GalilCreateAxis("Galil","D",1,"",1)
-GalilCreateAxis("Galil","E",1,"",1)
-GalilCreateAxis("Galil","F",1,"",1)
-GalilCreateAxis("Galil","G",1,"",1)
-GalilCreateAxis("Galil","H",1,"",1)
-
-#G21X3StartCard($(GCID),"",0,0)
-#GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc",0,0,3)
-GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc",0,0,3)
diff --git a/settings/IMAT/galil/galil04.cmd b/settings/IMAT/galil/galil04.cmd
deleted file mode 100644
index d9f2a59..0000000
--- a/settings/IMAT/galil/galil04.cmd
+++ /dev/null
@@ -1,30 +0,0 @@
-## configure galil crate 4
-
-## passed parameters
-##   GCID - galil crate software index. Numbering starts at 0 - will always be 0 if there is one to one galil crate <-> galil IOC mapping
-##   GALILADDR - address of this galil
-
-## see README_galil_cmd.txt for usage of commands below
-
-#G21X3Config($(GCID),"$(GALILADDR)",8,2100,2000)
-GalilCreateController("Galil", "$(GALILADDR)", 20)
-
-#G21X3NameConfig($(GCID),"A",2,0,2,-1,0,0,"",0,0,"",1,0,5000)
-#G21X3NameConfig($(GCID),"B",3,0,-1,-1,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"C",3,0,-1,-1,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"D",3,0,-1,-1,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"E",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"F",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"G",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"H",0,0,0,0,0,1,"",0,0,"",1,0)
-GalilCreateAxis("Galil","A",0,"",1)
-GalilCreateAxis("Galil","B",1,"",1)
-GalilCreateAxis("Galil","C",1,"",1)
-GalilCreateAxis("Galil","D",1,"",1)
-GalilCreateAxis("Galil","E",1,"",1)
-GalilCreateAxis("Galil","F",1,"",1)
-GalilCreateAxis("Galil","G",0,"",1)
-GalilCreateAxis("Galil","H",1,"",1)
-
-#G21X3StartCard($(GCID),"$(GALIL)/db/galil_Default_Header.gmc;$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_RevLimit.gmc!$(GALIL)/db/galil_Home_RevLimit.gmc!$(GALIL)/db/galil_Home_Home.gmc;$(GALIL)/db/galil_Default_Footer.gmc",0,0)
-GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_RevLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc",0,0,3)
diff --git a/settings/IMAT/galil/galil05.cmd b/settings/IMAT/galil/galil05.cmd
deleted file mode 100644
index 10573f4..0000000
--- a/settings/IMAT/galil/galil05.cmd
+++ /dev/null
@@ -1,31 +0,0 @@
-## configure galil crate 5
-
-## passed parameters
-##   GCID - galil crate software index. Numbering starts at 0 - will always be 0 if there is one to one galil crate <-> galil IOC mapping
-##   GALILADDR - address of this galil
-
-## see README_galil_cmd.txt for usage of commands below
-
-#G21X3Config($(GCID),"$(GALILADDR)",8,2100,2000)
-GalilCreateController("Galil", "$(GALILADDR)", -300)
-
-#G21X3NameConfig($(GCID),"A",2,0,2,0,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"B",4,0,2,0,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"C",2,0,0,0,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"D",2,0,2,0,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"E",2,0,2,0,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"F",4,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"G",2,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"H",3,0,0,0,0,1,"",0,0,"",1,0)
-GalilCreateAxis("Galil","A",0,"",1)
-GalilCreateAxis("Galil","B",0,"",1)
-GalilCreateAxis("Galil","C",0,"",1)
-GalilCreateAxis("Galil","D",0,"",1)
-GalilCreateAxis("Galil","E",0,"",1)
-GalilCreateAxis("Galil","F",1,"",1)
-GalilCreateAxis("Galil","G",1,"",1)
-GalilCreateAxis("Galil","H",1,"",1)
-
-#G21X3StartCard($(GCID),"$(GALIL)/db/galil_Default_Header.gmc;$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_RevLimit.gmc!$(GALIL)/db/galil_Home_RevLimit.gmc!$(GALIL)/db/galil_Home_Home.gmc;$(GALIL)/db/galil_Default_Footer.gmc",0,0)
-#GalilStartController("Galil","",0,0,0)
-GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_Home+FIneg.gmc!$(GALIL)/gmc/galil_Home_Home+FIpos.gmc!$(GALIL)/gmc/galil_Home_Home+FIneg.gmc!$(GALIL)/gmc/galil_Home_Home+FIneg.gmc!$(GALIL)/gmc/galil_Home_Home+FIneg.gmc!$(GALIL)/gmc/galil_Home_RevLimit.gmc!$(GALIL)/gmc/galil_Home_RevLimit.gmc!$(GALIL)/gmc/galil_Home_Home.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc",0,0,3)
diff --git a/settings/IMAT/galil/galil06.cmd b/settings/IMAT/galil/galil06.cmd
deleted file mode 100644
index 960a198..0000000
--- a/settings/IMAT/galil/galil06.cmd
+++ /dev/null
@@ -1,30 +0,0 @@
-## configure galil crate 6
-
-## passed parameters
-##   GCID - galil crate software index. Numbering starts at 0 - will always be 0 if there is one to one galil crate <-> galil IOC mapping
-##   GALILADDR - address of this galil
-
-## see README_galil_cmd.txt for usage of commands below
-
-#G21X3Config($(GCID),"$(GALILADDR)",8,2100,2000)
-GalilCreateController("Galil", "$(GALILADDR)", 20)
-
-#G21X3NameConfig($(GCID),"A",2,0,2,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"B",2,0,2,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"C",4,0,2,-1,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"D",4,0,-1,-1,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"E",2,0,-1,-1,0,0,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"F",2,0,0,-1,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"G",2,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"H",2,0,0,0,0,1,"",0,0,"",1,0)
-GalilCreateAxis("Galil","A",1,"",1)
-GalilCreateAxis("Galil","B",1,"",1)
-GalilCreateAxis("Galil","C",0,"",1)
-GalilCreateAxis("Galil","D",0,"",1)
-GalilCreateAxis("Galil","E",0,"",1)
-GalilCreateAxis("Galil","F",1,"",1)
-GalilCreateAxis("Galil","G",1,"",1)
-GalilCreateAxis("Galil","H",1,"",1)
-
-#G21X3StartCard($(GCID),"$(GALIL)/db/galil_Default_Header.gmc;$(GALIL)/db/galil_Home_RevLimit.gmc!$(GALIL)/db/galil_Home_RevLimit.gmc!$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_Home.gmc!$(GALIL)/db/galil_Home_RevLimit.gmc!$(GALIL)/db/galil_Home_RevLimit.gmc!$(GALIL)/db/galil_Home_RevLimit.gmc;$(GALIL)/db/galil_Default_Footer.gmc",0,0)
-GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_RevLimit.gmc!$(GALIL)/gmc/galil_Home_RevLimit.gmc!$(GALIL)/gmc/galil_Home_ForwLimit_Home.gmc!$(GALIL)/gmc/galil_Home_ForwLimit_Home.gmc!$(GALIL)/gmc/galil_Home_ForwLimit_Home.gmc!$(GALIL)/gmc/galil_Home_RevLimit.gmc!$(GALIL)/gmc/galil_Home_RevLimit.gmc!$(GALIL)/gmc/galil_Home_RevLimit.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc",0,0,3)
diff --git a/settings/IMAT/galil/galil07.cmd b/settings/IMAT/galil/galil07.cmd
deleted file mode 100644
index 390abc6..0000000
--- a/settings/IMAT/galil/galil07.cmd
+++ /dev/null
@@ -1,31 +0,0 @@
-## configure galil crate 7
-
-## passed parameters
-##   GCID - galil crate software index. Numbering starts at 0 - will always be 0 if there is one to one galil crate <-> galil IOC mapping
-##   GALILADDR - address of this galil
-
-## see README_galil_cmd.txt for usage of commands below
-
-#G21X3Config($(GCID),"$(GALILADDR)",8,2100,2000)
-GalilCreateController("Galil", "$(GALILADDR)", -20)
-
-#G21X3NameConfig($(GCID),"A",3,0,-1,-1,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"B",3,0,-1,-1,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"C",3,0,-1,-1,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"D",3,0,-1,-1,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"E",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"F",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"G",0,0,0,0,0,1,"",0,0,"",1,0)
-#G21X3NameConfig($(GCID),"H",0,0,0,0,0,1,"",0,0,"",1,0)
-GalilCreateAxis("Galil","A",0,"",1)
-GalilCreateAxis("Galil","B",0,"",1)
-GalilCreateAxis("Galil","C",0,"",1)
-GalilCreateAxis("Galil","D",0,"",1)
-GalilCreateAxis("Galil","E",0,"",1)
-GalilCreateAxis("Galil","F",0,"",1)
-GalilCreateAxis("Galil","G",0,"",1)
-GalilCreateAxis("Galil","H",0,"",1)
-
-#G21X3StartCard($(GCID),"",0,0)
-#GalilStartController("Galil","",0,0,0)
-GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_Thread.gmc!$(GALIL)/gmc/galil_Home_RevLimit.gmc!$(GALIL)/gmc/galil_Home_RevLimit.gmc!$(GALIL)/gmc/galil_Home_Home.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit+FIneg.gmc!$(GALIL)/gmc/galil_Home_ForwLimit.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc!$(GALIL)/gmc/galil_Home_Pin_Hole_Selector.gmc",0,0,3)
diff --git a/settings/IMAT/galil/galil08.cmd b/settings/IMAT/galil/galil08.cmd
deleted file mode 100644
index 030d08e..0000000
--- a/settings/IMAT/galil/galil08.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
-## configure galil crate 7
-
-## passed parameters
-##   GCID - galil crate software index. Numbering starts at 0 - will always be 0 if there is one to one galil crate <-> galil IOC mapping
-##   GALILADDR - address of this galil
-
-## see README_galil_cmd.txt for usage of commands below
-
-GalilCreateController("Galil", "$(GALILADDR)", 20)
-
-GalilCreateAxis("Galil","A",1,"",1)
-GalilCreateAxis("Galil","B",1,"",1)
-GalilCreateAxis("Galil","C",1,"",1)
-GalilCreateAxis("Galil","D",1,"",1)
-GalilCreateAxis("Galil","E",1,"",1)
-GalilCreateAxis("Galil","F",1,"",1)
-GalilCreateAxis("Galil","G",1,"",1)
-GalilCreateAxis("Galil","H",1,"",1)
-
-GalilStartController("Galil","$(GALIL)/gmc/galil_Default_Header.gmc;$(GALIL)/gmc/galil_Home_FIpos.gmc!$(GALIL)/gmc/galil_Home_FIpos.gmc!$(GALIL)/gmc/galil_Home_FIpos.gmc;$(GALIL)/gmc/galil_Default_Footer.gmc",0,0,3)
-
diff --git a/settings/IMAT/galil/jaws.cmd b/settings/IMAT/galil/jaws.cmd
deleted file mode 100644
index e408e2c..0000000
--- a/settings/IMAT/galil/jaws.cmd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Define a set of jaws from 4 motors (if present)
-$(IFIOC_GALIL_01) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS1:,mXN=MTR0105,mXS=MTR0106,mXW=MTR0107,mXE=MTR0108")
-
-# Define a set of jaws from 4 motors (if present)
-$(IFIOC_GALIL_02) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS2:,mXN=MTR0201,mXS=MTR0202,mXW=MTR0203,mXE=MTR0204")
-
-# Define a set of jaws from 4 motors (if present)
-$(IFIOC_GALIL_02) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS3:,mXN=MTR0205,mXS=MTR0206,mXW=MTR0207,mXE=MTR0208")
-
-# Define a set of jaws from 4 motors (if present)
-$(IFIOC_GALIL_03) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS4:,mXN=MTR0301,mXS=MTR0302,mXW=MTR0303,mXE=MTR0304")
-
-# Define a set of jaws from 4 motors (if present)
-$(IFIOC_GALIL_03) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS5:,mXN=MTR0305,mXS=MTR0306,mXW=MTR0307,mXE=MTR0308")
-
-# Define a set of jaws from 4 motors (if present)
-$(IFIOC_GALIL_04) dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=INCSLIT:,mXN=MTR0401,mXS=MTR0402,mXW=MTR0403,mXE=MTR0404")
diff --git a/settings/IMAT/galil/motionsetpoints-NDXDEMO.cmd b/settings/IMAT/galil/motionsetpoints-NDXDEMO.cmd
deleted file mode 100644
index b8ae4aa..0000000
--- a/settings/IMAT/galil/motionsetpoints-NDXDEMO.cmd
+++ /dev/null
@@ -1,38 +0,0 @@
-# $(ICPCONFIGDIR) or $(ICPCONFIGROOT) ?
-$(IFIOC_GALIL_06) epicsEnvSet "LOOKUPFILE1" "$(ICPCONFIGROOT)/motionSetPoints/monitor3.txt"
-$(IFIOC_GALIL_06) epicsEnvSet "LOOKUPFILE2" "$(ICPCONFIGROOT)/motionSetPoints/monitor4.txt"
-$(IFIOC_GALIL_05) epicsEnvSet "LOOKUPFILE3" "$(ICPCONFIGROOT)/motionSetPoints/sample_x.txt"
-$(IFIOC_GALIL_05) epicsEnvSet "LOOKUPFILE4" "$(ICPCONFIGROOT)/motionSetPoints/sample_y.txt"
-$(IFIOC_GALIL_06) epicsEnvSet "LOOKUPFILE5" "$(ICPCONFIGROOT)/motionSetPoints/analyser.txt"
-$(IFIOC_GALIL_06) epicsEnvSet "LOOKUPFILE6" "$(ICPCONFIGROOT)/motionSetPoints/polariser.txt"
-$(IFIOC_GALIL_06) epicsEnvSet "LOOKUPFILE7" "$(ICPCONFIGROOT)/motionSetPoints/beamstop.txt"
-$(IFIOC_GALIL_06) epicsEnvSet "LOOKUPFILE8" "$(ICPCONFIGROOT)/motionSetPoints/pinhole_selector.txt"
-
-$(IFIOC_GALIL_06) motionSetPointsConfigure("LOOKUPFILE1","LOOKUPFILE1")
-$(IFIOC_GALIL_06) motionSetPointsConfigure("LOOKUPFILE2","LOOKUPFILE2")
-$(IFIOC_GALIL_05) motionSetPointsConfigure("LOOKUPFILE3","LOOKUPFILE3")
-$(IFIOC_GALIL_05) motionSetPointsConfigure("LOOKUPFILE4","LOOKUPFILE4")
-$(IFIOC_GALIL_06) motionSetPointsConfigure("LOOKUPFILE5","LOOKUPFILE5")
-$(IFIOC_GALIL_06) motionSetPointsConfigure("LOOKUPFILE6","LOOKUPFILE6")
-$(IFIOC_GALIL_06) motionSetPointsConfigure("LOOKUPFILE7","LOOKUPFILE7")
-$(IFIOC_GALIL_06) motionSetPointsConfigure("LOOKUPFILE8","LOOKUPFILE8")
-
-# $(IFIOC_GALIL_06) dbLoadRecords("$(MOTIONSETPOINTS)/db/motionSetPoints.db","P=$(MYPVPREFIX)LKUP:MON3:,TARGET_PV1=$(MYPVPREFIX)MOT:MTR0601,TARGET_RBV1=$(MYPVPREFIX)MOT:MTR0601.RBV,TARGET_DONE=$(MYPVPREFIX)MOT:MTR0601.DMOV,TOL=1,LOOKUP=LOOKUPFILE1")
-
-$(IFIOC_GALIL_06) dbLoadRecords("$(MOTIONSETPOINTS)/db/motionSetPoints.db","P=$(MYPVPREFIX)LKUP:MON4:,TARGET_PV1=$(MYPVPREFIX)MOT:MTR0602,TARGET_RBV1=$(MYPVPREFIX)MOT:MTR0602.RBV,TARGET_DONE=$(MYPVPREFIX)MOT:MTR0602.DMOV,TOL=1,LOOKUP=LOOKUPFILE2")
-
-$(IFIOC_GALIL_05) dbLoadRecords("$(MOTIONSETPOINTS)/db/motionSetPoints.db","P=$(MYPVPREFIX)LKUP:SAMPX:,TARGET_PV1=$(MYPVPREFIX)MOT:MTR0502,TARGET_RBV1=$(MYPVPREFIX)MOT:MTR0502.RBV,TARGET_DONE=$(MYPVPREFIX)MOT:MTR0502.DMOV,FILTER_SRC=$(MYPVPREFIX)LKUP:SAMPY:FILTER:OUT,TOL=1,LOOKUP=LOOKUPFILE3")
-
-$(IFIOC_GALIL_05) dbLoadRecords("$(MOTIONSETPOINTS)/db/motionSetPoints.db","P=$(MYPVPREFIX)LKUP:SAMPY:,TARGET_PV1=$(MYPVPREFIX)MOT:MTR0507,TARGET_RBV1=$(MYPVPREFIX)MOT:MTR0507.RBV,TARGET_DONE=$(MYPVPREFIX)MOT:MTR0507.DMOV,TOL=1,LOOKUP=LOOKUPFILE4")
-
-$(IFIOC_GALIL_06) dbLoadRecords("$(MOTIONSETPOINTS)/db/motionSetPoints.db","P=$(MYPVPREFIX)LKUP:ANALYSER:,TARGET_PV1=$(MYPVPREFIX)MOT:MTR0606,TARGET_RBV1=$(MYPVPREFIX)MOT:MTR0606.RBV,TARGET_PV2=$(MYPVPREFIX)MOT:ANALYSER:THETA,TARGET_RBV2=$(MYPVPREFIX)MOT:ANALYSER:THETA.RBV,TARGET_DONE=$(MYPVPREFIX)MOT:MTR0606.DMOV,TARGET_DONE2=$(MYPVPREFIX)MOT:ANALYSER:THETA.DMOV,TOL=1,LOOKUP=LOOKUPFILE5")
-
-$(IFIOC_GALIL_06) dbLoadRecords("$(MOTIONSETPOINTS)/db/motionSetPoints.db","P=$(MYPVPREFIX)LKUP:POLARISER:,TARGET_PV1=$(MYPVPREFIX)MOT:MTR0603,TARGET_RBV1=$(MYPVPREFIX)MOT:MTR0603.RBV,TARGET_PV2=$(MYPVPREFIX)MOT:POLARISER:THETA,TARGET_RBV2=$(MYPVPREFIX)MOT:POLARISER:THETA.RBV,TARGET_DONE=$(MYPVPREFIX)MOT:MTR0603.DMOV,TARGET_DONE2=$(MYPVPREFIX)MOT:POLARISER:THETA.DMOV,TOL=1,LOOKUP=LOOKUPFILE6")
-
-$(IFIOC_GALIL_06) dbLoadRecords("$(MOTIONSETPOINTS)/db/analyserPolariser.db","D=$(MYPVPREFIX)MOT:ANALYSER:,M=$(MYPVPREFIX)MOT:MTR0605,H=100")
-$(IFIOC_GALIL_06) dbLoadRecords("$(MOTIONSETPOINTS)/db/analyserPolariser.db","D=$(MYPVPREFIX)MOT:POLARISER:,M=$(MYPVPREFIX)MOT:MTR0604,H=100")
-
-$(IFIOC_GALIL_06) dbLoadRecords("$(MOTIONSETPOINTS)/db/motionSetPoints.db","P=$(MYPVPREFIX)LKUP:BEAMSTOP:,TARGET_PV1=$(MYPVPREFIX)MOT:MTR0607,TARGET_RBV1=$(MYPVPREFIX)MOT:MTR0607.RBV,TARGET_PV2=$(MYPVPREFIX)MOT:MTR0608,TARGET_RBV2=$(MYPVPREFIX)MOT:MTR0608.RBV,TARGET_DONE=$(MYPVPREFIX)MOT:MTR0607.DMOV,TARGET_DONE2=$(MYPVPREFIX)MOT:MTR0608.DMOV,TOL=1,LOOKUP=LOOKUPFILE7")
-
-$(IFIOC_GALIL_06) dbLoadRecords("$(MOTIONSETPOINTS)/db/motionSetPoints.db","P=$(MYPVPREFIX)LKUP:PINHOLE:,TARGET_PV1=$(MYPVPREFIX)MOT:MTR0601,TARGET_RBV1=$(MYPVPREFIX)MOT:MTR0601.RBV,TARGET_DONE=$(MYPVPREFIX)MOT:MTR0601.DMOV,TOL=1,LOOKUP=LOOKUPFILE8")
-#
diff --git a/settings/IMAT/galil/motionsetpoints.cmd b/settings/IMAT/galil/motionsetpoints.cmd
deleted file mode 100644
index 0278c28..0000000
--- a/settings/IMAT/galil/motionsetpoints.cmd
+++ /dev/null
@@ -1,11 +0,0 @@
-# $(ICPCONFIGDIR) or $(ICPCONFIGROOT) ?
-$(IFIOC_GALIL_01) epicsEnvSet "LOOKUPFILE1" "$(ICPCONFIGROOT)/motionSetPoints/pinhole_selector.txt"
-$(IFIOC_GALIL_04) epicsEnvSet "LOOKUPFILE2" "$(ICPCONFIGROOT)/motionSetPoints/monitor9.txt"
-
-$(IFIOC_GALIL_01) motionSetPointsConfigure("LOOKUPFILE1","LOOKUPFILE1", 1)
-$(IFIOC_GALIL_04) motionSetPointsConfigure("LOOKUPFILE2","LOOKUPFILE2", 1)
-
-$(IFIOC_GALIL_01) dbLoadRecords("$(MOTIONSETPOINTS)/db/motionSetPointsSingleAxis.db","P=$(MYPVPREFIX)LKUP:PINHOLE:,AXIS0=$(MYPVPREFIX)MOT:PINHOLE,TOL=1,LOOKUP=LOOKUPFILE1")
-$(IFIOC_GALIL_04) dbLoadRecords("$(MOTIONSETPOINTS)/db/motionSetPointsSingleAxis.db","P=$(MYPVPREFIX)LKUP:MON9:,AXIS0=$(MYPVPREFIX)MOT:M9,TOL=1,LOOKUP=LOOKUPFILE2")
-$(IFIOC_GALIL_01) dbLoadRecordsLoop("$(MOTIONSETPOINTS)/db/inPos.db","P=$(MYPVPREFIX)LKUP:PINHOLE:,AXIS0=$(MYPVPREFIX)MOT:PINHOLE,TOL=1,LOOKUP=LOOKUPFILE1","NUMPOS", 0, 30)
-$(IFIOC_GALIL_04) dbLoadRecordsLoop("$(MOTIONSETPOINTS)/db/inPos.db","P=$(MYPVPREFIX)LKUP:MON9:,AXIS0=$(MYPVPREFIX)MOT:M9,TOL=1,LOOKUP=LOOKUPFILE2","NUMPOS", 0, 30)
diff --git a/settings/IMAT/galil/sampleChanger.cmd b/settings/IMAT/galil/sampleChanger.cmd
deleted file mode 100644
index cfc9ab7..0000000
--- a/settings/IMAT/galil/sampleChanger.cmd
+++ /dev/null
@@ -1,8 +0,0 @@
-# $(ICPCONFIGDIR) or $(ICPCONFIGROOT) ?
-$(IFIOC_GALIL_05) epicsEnvSet "RACKDEFS" "$(ICPCONFIGROOT)/motionSetPoints/rack_definitions.xml"
-$(IFIOC_GALIL_05) epicsEnvSet "SLOT_DETAILS_FILE" "$(ICPCONFIGROOT)/motionSetPoints/samplechanger.xml"
-$(IFIOC_GALIL_05) epicsEnvSet "SAMPLE_LKUP_FILE" "$(ICPCONFIGROOT)/motionSetPoints/sample.txt"
-
-$(IFIOC_GALIL_05) sampleChangerConfigure("CURRENT","CURRENT")
-
-$(IFIOC_GALIL_05) dbLoadRecords("$(SAMPLECHANGER)/db/sampleChanger.db","P=$(MYPVPREFIX)SAMPCHNG:,MOT_SET_POINT=$(MYPVPREFIX)LKUP:SAMPLE:,LOOKUP=CURRENT")
diff --git a/settings/IMAT/twincat/axes.cmd b/settings/IMAT/twincat/axes.cmd
index 3396fb1..de7e205 100644
--- a/settings/IMAT/twincat/axes.cmd
+++ b/settings/IMAT/twincat/axes.cmd
@@ -1,3 +1,14 @@
+# Deprecated axes left in for backward compatiblity
+dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:PHI,mAXIS=MTR0109")
+dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:CHI,mAXIS=MTR0110")
 
-dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:Z,mAXIS=MTR0602")
-dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:LARGETHETA,mAXIS=MTR0601")
+# Actual axes
+dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=PINHOLE,mAXIS=MTR0122")
+dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:PHI1,mAXIS=MTR0109")
+dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:PHI2,mAXIS=MTR0110")
+dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:THETA,mAXIS=MTR0111")
+dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:X,mAXIS=MTR0107")
+dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:Y,mAXIS=MTR0108")
+dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=M9,mAXIS=MTR0123")
+dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:Z,mAXIS=MTR0116")
+dbLoadRecords("$(AXIS)/db/axis.db","P=$(MYPVPREFIX)MOT:,AXIS=STACK:LARGETHETA,mAXIS=MTR0117")
diff --git a/settings/IMAT/twincat/jaws.cmd b/settings/IMAT/twincat/jaws.cmd
new file mode 100644
index 0000000..63d91c6
--- /dev/null
+++ b/settings/IMAT/twincat/jaws.cmd
@@ -0,0 +1,11 @@
+dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS1:,mXN=MTR0123,mXS=MTR0125,mXW=MTR0127,mXE=MTR0126")
+
+dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS2:,mXN=MTR0128,mXS=MTR0129,mXW=MTR0131,mXE=MTR0130")
+
+dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS3:,mXN=MTR0132,mXS=MTR0133,mXW=MTR0135,mXE=MTR0134")
+
+dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS4:,mXN=MTR0136,mXS=MTR0137,mXW=MTR0139,mXE=MTR0138")
+
+dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=JAWS5:,mXN=MTR0140,mXS=MTR0141,mXW=MTR0143,mXE=MTR0142")
+
+dbLoadRecords("$(JAWS)/db/jaws.db","P=$(MYPVPREFIX)MOT:,JAWS=INCSLIT:,mXN=MTR0103,mXS=MTR0104,mXW=MTR0106,mXE=MTR0105")
diff --git a/settings/IMAT/twincat/motionsetpoints.cmd b/settings/IMAT/twincat/motionsetpoints.cmd
new file mode 100644
index 0000000..cfe6610
--- /dev/null
+++ b/settings/IMAT/twincat/motionsetpoints.cmd
@@ -0,0 +1,11 @@
+epicsEnvSet "LOOKUPFILE1" "$(ICPCONFIGROOT)/motionSetPoints/pinhole_selector.txt"
+epicsEnvSet "LOOKUPFILE2" "$(ICPCONFIGROOT)/motionSetPoints/monitor9.txt"
+
+motionSetPointsConfigure("LOOKUPFILE1","LOOKUPFILE1", 1)
+motionSetPointsConfigure("LOOKUPFILE2","LOOKUPFILE2", 1)
+
+dbLoadRecords("$(MOTIONSETPOINTS)/db/motionSetPointsSingleAxis.db","P=$(MYPVPREFIX)LKUP:PINHOLE:,AXIS0=$(MYPVPREFIX)MOT:PINHOLE,TOL=1,LOOKUP=LOOKUPFILE1")
+dbLoadRecords("$(MOTIONSETPOINTS)/db/motionSetPointsSingleAxis.db","P=$(MYPVPREFIX)LKUP:MON9:,AXIS0=$(MYPVPREFIX)MOT:M9,TOL=1,LOOKUP=LOOKUPFILE2")
+
+dbLoadRecordsLoop("$(MOTIONSETPOINTS)/db/inPos.db","P=$(MYPVPREFIX)LKUP:PINHOLE:,AXIS0=$(MYPVPREFIX)MOT:PINHOLE,TOL=1,LOOKUP=LOOKUPFILE1","NUMPOS", 0, 30)
+dbLoadRecordsLoop("$(MOTIONSETPOINTS)/db/inPos.db","P=$(MYPVPREFIX)LKUP:MON9:,AXIS0=$(MYPVPREFIX)MOT:M9,TOL=1,LOOKUP=LOOKUPFILE2","NUMPOS", 0, 30)
diff --git a/settings/IMAT/twincat/sampleChanger.cmd b/settings/IMAT/twincat/sampleChanger.cmd
new file mode 100644
index 0000000..6116ee1
--- /dev/null
+++ b/settings/IMAT/twincat/sampleChanger.cmd
@@ -0,0 +1,7 @@
+epicsEnvSet "RACKDEFS" "$(ICPCONFIGROOT)/motionSetPoints/rack_definitions.xml"
+epicsEnvSet "SLOT_DETAILS_FILE" "$(ICPCONFIGROOT)/motionSetPoints/samplechanger.xml"
+epicsEnvSet "SAMPLE_LKUP_FILE" "$(ICPCONFIGROOT)/motionSetPoints/sample.txt"
+
+sampleChangerConfigure("CURRENT","CURRENT")
+
+dbLoadRecords("$(SAMPLECHANGER)/db/sampleChanger.db","P=$(MYPVPREFIX)SAMPCHNG:,MOT_SET_POINT=$(MYPVPREFIX)LKUP:SAMPLE:,LOOKUP=CURRENT")