diff --git a/site_ansto/instrument/bilby/config/commands/commands.tcl b/site_ansto/instrument/bilby/config/commands/commands.tcl
index 0a74bf31..7fe5d62a 100644
--- a/site_ansto/instrument/bilby/config/commands/commands.tcl
+++ b/site_ansto/instrument/bilby/config/commands/commands.tcl
@@ -9,18 +9,8 @@ namespace eval motor {
     variable is_homing_list ""
 }
 
-# Some metadata variables about the beamstop and the beam
-foreach {var lname type priv units klass} {
-  BeamCenterX      BeamCenterX        float user     mm   parameter
-  BeamCenterY      BeamCenterY        float user     mm   parameter
-  BeamStop         BeamStop           int   user     none parameter
-} {
-  ::utility::mkVar $var $type $priv $lname true $klass true true
-  if {$units != "none"} {
-    sicslist setatt $var units $units
-  }
-}
 # TODO Implement BeamStop as a macro which checks actual beamstop positions.
+::utility::mkVar BeamStop int user BeamStop true parameter true true
 BeamStop -1
 
 ##
diff --git a/site_ansto/instrument/bilby/config/parameters/parameters.tcl b/site_ansto/instrument/bilby/config/parameters/parameters.tcl
index c514762c..8b7d5edb 100644
--- a/site_ansto/instrument/bilby/config/parameters/parameters.tcl
+++ b/site_ansto/instrument/bilby/config/parameters/parameters.tcl
@@ -1,7 +1,6 @@
 foreach {var lname type priv units klass} {
   BeamCenterX      BeamCenterX        float user     mm   parameter
   BeamCenterZ      BeamCenterZ        float user     mm   parameter
-  BeamStop         BeamStop           int   user     none parameter
 } {
   ::utility::mkVar $var $type $priv $lname true $klass true true
   if {$units != "none"} {