diff --git a/atSite/Archive.prj b/atSite/Archive.prj
index 3aad4cf..9585b88 100644
--- a/atSite/Archive.prj
+++ b/atSite/Archive.prj
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fba15300470d48d753ba2ee8b52c713720143e44a15ea81fe41c1bd7db913d78
-size 3872819
+oid sha256:ec936b5e6f7dc37de702daee723fcb2a7e159418a2935ed22512c0b71d1ff2d1
+size 3610292
diff --git a/atSite/RRF-MainWater-User-ATOM-CRDESKTOP.opt b/atSite/RRF-MainWater-User-ATOM-CRDESKTOP.opt
index f14b5bf..406844e 100644
Binary files a/atSite/RRF-MainWater-User-ATOM-CRDESKTOP.opt and b/atSite/RRF-MainWater-User-ATOM-CRDESKTOP.opt differ
diff --git a/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo b/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo
index 757f0ec..7cdebfd 100644
--- a/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo
+++ b/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9baa38e1fcdc83ec9e6b17a04f1e0f607566c6feed3dc6a19bb6afa66edcf322
-size 10398965
+oid sha256:bce2d62198f7589ff642745dc008400425a17b6629d1d80582569b86611776e2
+size 9340053
diff --git a/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo_guids b/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo_guids
index 4543a9a..7ee1cd0 100644
Binary files a/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo_guids and b/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.bootinfo_guids differ
diff --git a/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.compileinfo b/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.compileinfo
index ec5603b..7cdebfd 100644
--- a/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.compileinfo
+++ b/atSite/RRF-MainWater.Device.Application.c3054746-ca09-45cf-a1d9-79a0f6908107.compileinfo
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a62c502f69ee4d548f1e29e90ca6369239012555690f06c42498048802ef6e30
-size 9861033
+oid sha256:bce2d62198f7589ff642745dc008400425a17b6629d1d80582569b86611776e2
+size 9340053
diff --git a/atSite/RRF-MainWater.Device.Application.xml b/atSite/RRF-MainWater.Device.Application.xml
index eaa995a..9c67043 100644
--- a/atSite/RRF-MainWater.Device.Application.xml
+++ b/atSite/RRF-MainWater.Device.Application.xml
@@ -6,157 +6,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -175,35 +59,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
@@ -222,551 +87,157 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- List of all devices
-
-
-
-
- List of all devices
-
-
-
- Alarm logging and active alarm count
-
-
-
- List of all devices
-
-
-
-
- List of all devices
-
-
-
-
- List of all devices
-
-
-
-
- List of all devices
-
-
-
-
- List of all devices
-
-
@@ -780,12 +251,6 @@
Pulse flow meter
-
- cistern level low limits.
-
-
- cistern level low limits.
-
Outflow
@@ -800,27 +265,6 @@
-
- Well control
-
-
- Well control
-
-
- Chemical Injection
-
-
- Fake VFD for well controller
-
-
- Well control
-
-
- Chemical Injection
-
-
- Fake VFD for well controller
-
diff --git a/atSite/RRF-MainWater.project b/atSite/RRF-MainWater.project
index 04523d1..29057f7 100644
--- a/atSite/RRF-MainWater.project
+++ b/atSite/RRF-MainWater.project
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9c16da210265d807b712ea782f2691f1eb9afd7b1350fdc2113a892de3bb7073
-size 7236842
+oid sha256:c2a6b1b8b9ac3ae27bd456e8dc66e25c9f8fcb6224e002db1e4d1ea2a6035239
+size 4785846
diff --git a/atSite/RRF-MainWater.~u b/atSite/RRF-MainWater.~u
deleted file mode 100644
index ad3a7f2..0000000
--- a/atSite/RRF-MainWater.~u
+++ /dev/null
@@ -1,4 +0,0 @@
-User
-ATOM-CRDESKTOP
-20500
-638978119996391959
diff --git a/atSite/RRF-MainWater_autosave.precompilecache b/atSite/RRF-MainWater_autosave.precompilecache
index f0c4ae1..af34d12 100644
--- a/atSite/RRF-MainWater_autosave.precompilecache
+++ b/atSite/RRF-MainWater_autosave.precompilecache
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0def0241f4f04d5dc4b093651d593eb544dd45f32d1560ada9cf1ab1a36a2043
-size 794128
+oid sha256:db9196941073adfbae154225a5818f55fea0716883b9d2a4975c3971298a666a
+size 553324
diff --git a/atSite/RRF-MainWater_project.precompilecache b/atSite/RRF-MainWater_project.precompilecache
index 33d87d9..6c34092 100644
--- a/atSite/RRF-MainWater_project.precompilecache
+++ b/atSite/RRF-MainWater_project.precompilecache
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8a11f3a7df4695ad9700ed683d5b3b3e68133c999dcc9a71e42e620a835ea159
-size 794128
+oid sha256:2e659182c21627b98558a20f52de2d2efbaf795f58cc5578f87c93618fd15b71
+size 553324