diff --git a/site_ansto/instrument/server_config.tcl b/site_ansto/instrument/server_config.tcl
index 425e685b..50ba5c10 100644
--- a/site_ansto/instrument/server_config.tcl
+++ b/site_ansto/instrument/server_config.tcl
@@ -16,18 +16,18 @@ set quieckport    60004
 # icsval column = settings when running on the Instrument Control Server (ie SICS_SIMULATION not defined)
 # fakedev column = settings for test platforms (ie SICS_SIMULATION=fakedev)
 foreach {simflag         icsval    fakedev} {
-  opal_simulation        false     true 
-  detector_simulation    false     true 
-  hmm_simulation         false     true 
-  environment_simulation false     true 
+  opal_simulation        false     true
+  detector_simulation    false     true
+  hmm_simulation         false     true
+  environment_simulation false     true
   counter_simulation     false     false
   motor_simulation       false     false
-  chopper_simulation     false     false 
-  velsel_simulation      false     false 
-  plc_simulation         false     true 
-  rfgen_simulation       false     false 
-  goniometer_simulation  false     true 
-  magnetic_simulation    false     true 
+  chopper_simulation     false     false
+  velsel_simulation      false     false
+  plc_simulation         false     true
+  rfgen_simulation       false     false
+  goniometer_simulation  false     true
+  magnetic_simulation    false     true
 } {
   dict set SIMFLAG_VAL $simflag ICSVAL  $icsval
   dict set SIMFLAG_VAL $simflag FAKEDEV $fakedev
@@ -41,7 +41,7 @@ source util/script_context_util.tcl
 
 proc syncbackup {file} {
   backup motorSave
-  backup $file 
+  backup $file
   backup motorSave
 }
 publish syncbackup Spy
@@ -124,7 +124,7 @@ if [file exists ../sics_config.ini] {
   set config_dict [config_reader::dump ../sics_config.ini]
 }
 
-set cfParent config 
+set cfParent config
 
 #WARNING Make sure there are no spaces after the back-slashes
 array set cfPath [list\
@@ -149,31 +149,31 @@ tasmad        $cfParent/tasmad\
 robots        $cfParent/robots\
 ]
 
-ServerOption LogFileBaseName $sicsroot/log/serverlog 
+ServerOption LogFileBaseName $sicsroot/log/serverlog
 
-installprotocolhandler 
+installprotocolhandler
 
 
-ServerOption statusfile $sicsroot/log/status.tcl 
-ServerOption RedirectFile $sicsroot/log/stdout 
-ServerOption LogFileDir $sicsroot/log 
+ServerOption statusfile $sicsroot/log/status.tcl
+ServerOption RedirectFile $sicsroot/log/stdout
+ServerOption LogFileDir $sicsroot/log
 ServerOption QuieckPort $quieckport
 ServerOption ServerPort $serverport
 ServerOption InterruptPort  $interruptport
-ServerOption TelWord sicslogin 
+ServerOption TelWord sicslogin
 ServerOption TelnetPort  $telnetport
-ServerOption ReadUserPasswdTimeout 600000 
-ServerOption AcceptTimeOut 10 
-ServerOption ReadTimeOut 10 
-SicsUser manager ansto 1 
-SicsUser user sydney 2 
-SicsUser spy 007 3 
+ServerOption ReadUserPasswdTimeout 600000
+ServerOption AcceptTimeOut 10
+ServerOption ReadTimeOut 10
+SicsUser manager ansto 1
+SicsUser user sydney 2
+SicsUser spy 007 3
 
-MakeDataNumber SicsDataNumber $sicsroot/DataNumber 
+MakeDataNumber SicsDataNumber $sicsroot/DataNumber
 
 #Instrument specific configs must set the Instrument variable
 ::utility::mkVar SicsDataPrefix Text internal
-SicsDataPrefix [SplitReply [Instrument]] 
+SicsDataPrefix [SplitReply [Instrument]]
 
 ::utility::mkVar SicsDataPostFix Text manager
 SicsDataPostFix nx.hdf
@@ -187,7 +187,7 @@ foreach {var val klass priv} {
 }
 
 ::utility::mkVar SicsDataPath Text internal
-SicsDataPath $sicsroot/data/ 
+SicsDataPath $sicsroot/data/
 SicsDataPath lock
 ::utility::mkVar Title Text user title true experiment true true
 ::utility::mkVar SampleDescription Text user description true sample true true
@@ -243,17 +243,17 @@ proc waitaction {obj action args} {
 }
 publish waitaction user
 
-proc server_set_sobj_attributes {} { 
+proc server_set_sobj_attributes {} {
   if [ catch {
-    motor_set_sobj_attributes 
+    motor_set_sobj_attributes
     ::utility::set_motor_attributes
 #XXX::utility::set_histomem_attributes
     ::utility::set_sobj_attributes
     ::utility::set_envcontrol_attributes
-    ::plc::set_sobj_attributes 
-    ::counter::set_sobj_attributes 
-    ::nexus::set_sobj_attributes 
-    ::histogram_memory::set_sobj_attributes 
+    ::plc::set_sobj_attributes
+    ::counter::set_sobj_attributes
+    ::nexus::set_sobj_attributes
+    ::histogram_memory::set_sobj_attributes
     ::utility::set_chopper_attributes
     ::utility::set_sct_object_attributes
 ## TODO move the following to the new ansto gumxml.tcl
@@ -295,7 +295,7 @@ proc server_init {} {
     sicslist setatt sics_suid data true
     sicslist setatt sics_suid control true
     sicslist setatt sics_suid nxsave true
-    sicslist setatt sics_suid long_name sics_suid 
+    sicslist setatt sics_suid long_name sics_suid
 
     set AUTOSAVE_STATE "DISABLED"
 
@@ -365,7 +365,7 @@ proc autosave { {interval 300} } {
     } else {
       if {$AUTOSAVE_STATE == "DISABLED"} {
         sicspoll add doAutosave script $interval doAutosave
-#       sicspoll listen # WARNING:When the listening client exits it leaves SICSPOLL task with a corrupt connection object.  
+#       sicspoll listen # WARNING:When the listening client exits it leaves SICSPOLL task with a corrupt connection object.
         set AUTOSAVE_STATE "ENABLED"
       } else {
         sicspoll intervall doAutosave $interval
@@ -374,7 +374,7 @@ proc autosave { {interval 300} } {
   } else {
     set as_error 1
   }
-  
+
   set_rights $myrights
 
   if {$as_error} {