diff --git a/facilities/hcf.yaml b/facilities/hcf.yaml
deleted file mode 100644
index 2b32df7..0000000
--- a/facilities/hcf.yaml
+++ /dev/null
@@ -1,168 +0,0 @@
-facility: HCF
-bot_name: HCF Sync Bot
-description: Honolulu Control Facility
-api: https://api.vhcf.net
-base_url: https://www.vhcf.net
-discord_id: 769347549651664906
-name_format: first_last
-staff_format: highest
-staff_title_separator: "/"
-positions:
-- name: ZAK Oceanic
-  callsigns:
-    prefix: ["ZAK"]
-    suffix: ["FSS"]
-- name: Enroute
-  callsigns:
-    prefix:
-    - HNL
-    - GUM
-    suffix: ["CTR"]
-- name: Approach/Departure
-  callsigns:
-    prefix:
-    - HNL
-    - OGG
-    - ITO
-    - HNG
-    - SPN
-    - GUM
-    suffix: ["APP"]
-- name: Cab Positions
-  callsigns:
-    prefix:
-    - BKH
-    - LIH
-    - HHI
-    - HNL
-    - ITO
-    - JRF
-    - KOA
-    - MKK
-    - NGF
-    - OGG
-    - GUM
-    - UAM
-    - SPN
-    - BSF
-    suffix:
-    - TWR
-    - GND
-    - DEL
-online_channel: "1151919393647898686"
-no_controllers_online_message: |
-  No Controllers are currently online.
-roles:
-- id: 769347549667917901 # Role ID
-  name: HCF Senior Staff # Role Name (primarily for logging)
-  if: # Conditions evaluated as a logical OR
-  - condition: has_role
-    value: ATM
-  - condition: has_role
-    value: DATM
-  - condition: has_role
-    value: TA
-- id: 769347549667917900
-  name: HCF Staff
-  if:
-  - condition: has_role
-    value: EC
-  - condition: has_role
-    value: FE
-  - condition: has_role
-    value: WM
-- id: 887160589674225716
-  name: HCF Assistant Staff
-  if:
-  - condition: has_role
-    value: facilities
-  - condition: has_role
-    value: events
-  - condition: has_role
-    value: web
-- id: 1151981135996407900
-  name: Training Staff
-  if:
-  - condition: has_role
-    value: INS
-  - condition: has_role
-    value: MTR
-- id: 1151981811895898175
-  name: Facilities Team
-  if:
-  - condition: has_role
-    value: facilities
-  - condition: has_role
-    value: FE
-- id: 769347549659922467
-  name: Events Team
-  if:
-  - condition: has_role
-    value: events
-  - condition: has_role
-    value: EC
-- id: 769347549667917896
-  name: Instructors
-  if:
-  - condition: has_role
-    value: INS
-- id: 769347549667917895
-  name: Mentors
-  if:
-  - condition: has_role
-    value: MTR
-- id: 769347549659922469
-  name: HCF Members
-  if:
-  - condition: controller_type
-    value: home
-- id: 769347549659922468
-  name: Visitors
-  if:
-  - condition: controller_type
-    value: visitor
-- id: 856333793157185556
-  name: Pilot
-  if:
-  - condition: controller_type
-    value: none
-- id: 1151982656070893700
-  name: Unverified Users
-  if:
-  - condition: unknown
-    value: true
-- id: 769347549651664913
-  name: S1
-  if:
-  - condition: rating
-    value: S1
-- id: 769347549651664914
-  name: S2
-  if:
-  - condition: rating
-    value: S2
-- id: 769347549651664915
-  name: S3
-  if:
-  - condition: rating
-    value: S3
-- id: 769347549659922462
-  name: C1
-  if:
-  - condition: rating
-    value: C1
-- id: 769347549659922463
-  name: C3
-  if:
-  - condition: rating
-    value: C3
-- id: 769347549659922464
-  name: I1
-  if:
-  - condition: rating
-    value: I1
-- id: 769347549659922465
-  name: I3
-  if:
-  - condition: rating
-    value: I3
diff --git a/facilities/zfw.yaml b/facilities/zfw.yaml
index 149930b..1056e01 100644
--- a/facilities/zfw.yaml
+++ b/facilities/zfw.yaml
@@ -129,15 +129,15 @@ no_controllers_online_message: |
 # - rating: Checks user rating (S1, S2, etc)
 # - unknown: Checks if the account is linked on the roster
 roles:
-- #id: 767785144299159602 # Role ID
-  #name: Senior Staff # Role Name (primarily for logging)
-  #if: # Conditions evaluated as a logical OR
-  - #condition: has_role
-    #value: ATM
-  - #condition: has_role
-    #value: DATM
-  - #condition: has_role
-    #value: TA
+#- id: 767785144299159602 # Role ID
+#  name: Senior Staff # Role Name (primarily for logging)
+#  if: # Conditions evaluated as a logical OR
+#  - condition: has_role
+#    value: ATM
+#  - condition: has_role
+#    value: DATM
+#  - condition: has_role
+#    value: TA
 - id: 767820940875923496
   name: ARTCC Staff
   if: