diff --git a/inventory.yaml b/inventory.yaml
index a874cfd..4231bc2 100644
--- a/inventory.yaml
+++ b/inventory.yaml
@@ -22,19 +22,14 @@ general_use_bare_metal:
     hosts:
         corn-syrup.csclub.uwaterloo.ca:
         hfcs.csclub.uwaterloo.ca:
-        sucrose.csclub.uwaterloo.ca:
-        taurine.csclub.uwaterloo.ca:
+        carbonated-water.csclub.uwaterloo.ca:
+        neotame.csclub.uwaterloo.ca:
+        sorbitol.csclub.uwaterloo.ca:
+        mannitol.csclub.uwaterloo.ca:
 
 general_use_containers:
     hosts:
         caffeine.csclub.uwaterloo.ca:
-    children:
-        webnodes:
-
-webnodes:
-    hosts:
-        caffeine-00.csclub.uwaterloo.ca:
-        caffeine-01.csclub.uwaterloo.ca:
 
 office:
     hosts:
@@ -52,48 +47,36 @@ syscom:
 
 syscom-bare-metal:
     hosts:
-        aspartame.csclub.uwaterloo.ca:
-        dextrose.csclub.uwaterloo.ca:
+        #xylitol
         cobalamin.csclub.uwaterloo.ca:
-        glomag.csclub.uwaterloo.ca:
         potassium-benzoate.csclub.uwaterloo.ca:
-        sodium-benzoate.csclub.uwaterloo.ca:
         yerba-mate.csclub.uwaterloo.ca:
-        guayusa.csclub.uwaterloo.ca:
-        coffee.csclub.uwaterloo.ca:
+        phosphoric-acid.csclub.uwaterloo.ca:
 
 cloud:
     hosts:
-        db1.cloud.csclub.uwaterloo.ca:
-        controller1.cloud.csclub.uwaterloo.ca:
-        network1.cloud.csclub.uwaterloo.ca:
-        block1.cloud.csclub.uwaterloo.ca:
-        object1.cloud.csclub.uwaterloo.ca:
-        web1.cloud.csclub.uwaterloo.ca:
-        router1.cloud.csclub.uwaterloo.ca:
+        biloba.csclub.uwaterloo.ca:
+        chamomile.csclub.uwaterloo.ca:
         ginkgo.csclub.uwaterloo.ca:
+        guayusa.csclub.uwaterloo.ca:
+        riboflavin.csclub.uwaterloo.ca:
 
 syscom-containers:
     hosts:
         auth1.csclub.uwaterloo.ca:
         auth2.csclub.uwaterloo.ca:
+        chat.csclub.uwaterloo.ca:
+        coffee.csclub.uwaterloo.ca:
         mail.csclub.uwaterloo.ca:
         munin.csclub.uwaterloo.ca:
         rt.csclub.uwaterloo.ca:
-        netbox.csclub.uwaterloo.ca:
-        logstash.csclub.uwaterloo.ca:
         dns1.csclub.uwaterloo.ca:
         dns2.csclub.uwaterloo.ca:
-        cifs.csclub.uwaterloo.ca:
         mattermost.csclub.uwaterloo.ca:
-        shibboleth.csclub.uwaterloo.ca:
         test-ipv6.csclub.uwaterloo.ca:
-        etcd-mc.csclub.uwaterloo.ca:
-        etcd-dc.csclub.uwaterloo.ca:
         etcd-phy.csclub.uwaterloo.ca:
         prometheus.csclub.uwaterloo.ca:
-    children:
-        load-balancers:
+        progcom.csclub.uwaterloo.ca:
 
 audio-sink:
     hosts:
@@ -102,23 +85,3 @@ audio-sink:
 mirror:
     hosts:
         potassium-benzoate.csclub.uwaterloo.ca:
-
-load-balancers:
-    hosts:
-        load-balancer-01.csclub.uwaterloo.ca:
-            lb_priority: 110
-        load-balancer-02.csclub.uwaterloo.ca:
-            lb_priority: 100
-
-cloud-csc-club-managed:
-    children:
-        club-iie:
-        club-uwarc:
-
-club-iie:
-    hosts:
-        wiki.iie.csclub.cloud
-
-club-uwarc:
-    hosts:
-        wiki.uwarc.csclub.cloud