diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml
index c0a2c2b4a..9f6e9e9fb 100644
--- a/vars/local_vars_big.yml
+++ b/vars/local_vars_big.yml
@@ -36,7 +36,7 @@ iiab_domain: lan
 iiab_home_url: /home
 # You might also want to set captiveportal_splash_page (below!)
 
-# Raspbian requires WiFi country since March 2018.  Please set it here:
+# Raspbian requires Wi-Fi country since March 2018.  Please set it here:
 host_country_code: US
 host_ssid: "Internet in a Box"
 host_wifi_mode: g
@@ -101,7 +101,7 @@ bluetooth_term_enabled: False
 # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu)
 js_menu_install: True
 
-# Unmaintained as of October 2017: https://github.com/iiab/iiab/pull/382
+# UNMAINTAINED as of October 2017: https://github.com/iiab/iiab/pull/382
 # wondershaper_install: False
 # wondershaper_enabled: False
 
@@ -164,14 +164,6 @@ squid_enabled: False
 dansguardian_install: False
 dansguardian_enabled: False
 
-# PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch!
-postgresql_install: False
-postgresql_enabled: False
-
-# Unmaintained
-# authserver_install: False
-# authserver_enabled: False
-
 # Common UNIX Printing System (CUPS)
 cups_install: True
 cups_enabled: True
@@ -189,17 +181,20 @@ iiab_usb_lib_show_all: True
 # Lesser-supported XO services need additional testing.  Please contact
 # http://lists.laptop.org/pipermail/server-devel/ if you're able to help test.
 
+# UNMAINTAINED
 # xo_services_install: False
 # xo_services_enabled: False
 
+# UNMAINTAINED
 # activity_server_install: False
 # activity_server_enabled: False
 
+# UNMAINTAINED
 # Please instead consider 'ejabberd' in Stage 6-GENERIC-APPS below
 # ejabberd_xs_install: False
 # ejabberd_xs_enabled: False
 
-# UNMAINTAINED since about 2012-2017
+# UNMAINTAINED
 # Change calibre_port from 8080 to 8010 below, if you enable idmgr
 # idmgr_install: False
 # idmgr_enabled: False
@@ -210,11 +205,11 @@ iiab_usb_lib_show_all: True
 azuracast_install: False
 azuracast_enabled: False
 
-# Unmaintained as of January 2020: https://github.com/iiab/iiab/issues/2056
+# UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056
 dokuwiki_install: False
 dokuwiki_enabled: False
 
-# Unmaintained as of November 2019
+# UNMAINTAINED as of November 2019
 ejabberd_install: False
 ejabberd_enabled: False
 
@@ -379,11 +374,15 @@ calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
 # 2019: https://github.com/iiab/iiab/wiki/IIAB-Maps SEE ABOVE osm_vector_maps_*
 # 2018: http://download.iiab.io/content/OSM/vector-tiles/
 # 2017: http://oer2go.org/viewmod/en-worldmap-10
-#
-# Unmaintained
-# osm_install: False
-# osm_enabled: False
 
-# Unmaintained
+# UNMAINTAINED
+# authserver_install: False
+# authserver_enabled: False
+
+# UNMAINTAINED
 # docker_install: False
 # docker_enabled: False
+
+# UNMAINTAINED
+# osm_install: False
+# osm_enabled: False
diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml
index 1a6591d5f..75e424c17 100644
--- a/vars/local_vars_medium.yml
+++ b/vars/local_vars_medium.yml
@@ -36,7 +36,7 @@ iiab_domain: lan
 iiab_home_url: /home
 # You might also want to set captiveportal_splash_page (below!)
 
-# Raspbian requires WiFi country since March 2018.  Please set it here:
+# Raspbian requires Wi-Fi country since March 2018.  Please set it here:
 host_country_code: US
 host_ssid: "Internet in a Box"
 host_wifi_mode: g
@@ -101,7 +101,7 @@ bluetooth_term_enabled: False
 # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu)
 js_menu_install: True
 
-# Unmaintained as of October 2017: https://github.com/iiab/iiab/pull/382
+# UNMAINTAINED as of October 2017: https://github.com/iiab/iiab/pull/382
 # wondershaper_install: False
 # wondershaper_enabled: False
 
@@ -164,14 +164,6 @@ squid_enabled: False
 dansguardian_install: False
 dansguardian_enabled: False
 
-# PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch!
-postgresql_install: False
-postgresql_enabled: False
-
-# Unmaintained
-# authserver_install: False
-# authserver_enabled: False
-
 # Common UNIX Printing System (CUPS)
 cups_install: False
 cups_enabled: False
@@ -189,17 +181,20 @@ iiab_usb_lib_show_all: True
 # Lesser-supported XO services need additional testing.  Please contact
 # http://lists.laptop.org/pipermail/server-devel/ if you're able to help test.
 
+# UNMAINTAINED
 # xo_services_install: False
 # xo_services_enabled: False
 
+# UNMAINTAINED
 # activity_server_install: False
 # activity_server_enabled: False
 
+# UNMAINTAINED
 # Please instead consider 'ejabberd' in Stage 6-GENERIC-APPS below
 # ejabberd_xs_install: False
 # ejabberd_xs_enabled: False
 
-# UNMAINTAINED since about 2012-2017
+# UNMAINTAINED
 # Change calibre_port from 8080 to 8010 below, if you enable idmgr
 # idmgr_install: False
 # idmgr_enabled: False
@@ -210,11 +205,11 @@ iiab_usb_lib_show_all: True
 azuracast_install: False
 azuracast_enabled: False
 
-# Unmaintained as of January 2020: https://github.com/iiab/iiab/issues/2056
+# UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056
 dokuwiki_install: False
 dokuwiki_enabled: False
 
-# Unmaintained as of November 2019
+# UNMAINTAINED as of November 2019
 ejabberd_install: False
 ejabberd_enabled: False
 
@@ -379,11 +374,15 @@ calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
 # 2019: https://github.com/iiab/iiab/wiki/IIAB-Maps SEE ABOVE osm_vector_maps_*
 # 2018: http://download.iiab.io/content/OSM/vector-tiles/
 # 2017: http://oer2go.org/viewmod/en-worldmap-10
-#
-# Unmaintained
-# osm_install: False
-# osm_enabled: False
 
-# Unmaintained
+# UNMAINTAINED
+# authserver_install: False
+# authserver_enabled: False
+
+# UNMAINTAINED
 # docker_install: False
 # docker_enabled: False
+
+# UNMAINTAINED
+# osm_install: False
+# osm_enabled: False
diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml
index 6f709a265..408306a32 100644
--- a/vars/local_vars_min.yml
+++ b/vars/local_vars_min.yml
@@ -101,7 +101,7 @@ bluetooth_term_enabled: False
 # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu)
 js_menu_install: True
 
-# Unmaintained as of October 2017: https://github.com/iiab/iiab/pull/382
+# UNMAINTAINED as of October 2017: https://github.com/iiab/iiab/pull/382
 # wondershaper_install: False
 # wondershaper_enabled: False
 
@@ -164,14 +164,6 @@ squid_enabled: False
 dansguardian_install: False
 dansguardian_enabled: False
 
-# PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch!
-postgresql_install: False
-postgresql_enabled: False
-
-# Unmaintained
-# authserver_install: False
-# authserver_enabled: False
-
 # Common UNIX Printing System (CUPS)
 cups_install: False
 cups_enabled: False
@@ -189,17 +181,20 @@ iiab_usb_lib_show_all: True
 # Lesser-supported XO services need additional testing.  Please contact
 # http://lists.laptop.org/pipermail/server-devel/ if you're able to help test.
 
+# UNMAINTAINED
 # xo_services_install: False
 # xo_services_enabled: False
 
+# UNMAINTAINED
 # activity_server_install: False
 # activity_server_enabled: False
 
+# UNMAINTAINED
 # Please instead consider 'ejabberd' in Stage 6-GENERIC-APPS below
 # ejabberd_xs_install: False
 # ejabberd_xs_enabled: False
 
-# UNMAINTAINED since about 2012-2017
+# UNMAINTAINED
 # Change calibre_port from 8080 to 8010 below, if you enable idmgr
 # idmgr_install: False
 # idmgr_enabled: False
@@ -210,11 +205,11 @@ iiab_usb_lib_show_all: True
 azuracast_install: False
 azuracast_enabled: False
 
-# Unmaintained as of January 2020: https://github.com/iiab/iiab/issues/2056
+# UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056
 dokuwiki_install: False
 dokuwiki_enabled: False
 
-# Unmaintained as of November 2019
+# UNMAINTAINED as of November 2019
 ejabberd_install: False
 ejabberd_enabled: False
 
@@ -379,11 +374,15 @@ calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
 # 2019: https://github.com/iiab/iiab/wiki/IIAB-Maps SEE ABOVE osm_vector_maps_*
 # 2018: http://download.iiab.io/content/OSM/vector-tiles/
 # 2017: http://oer2go.org/viewmod/en-worldmap-10
-#
-# Unmaintained
-# osm_install: False
-# osm_enabled: False
 
-# Unmaintained
+# UNMAINTAINED
+# authserver_install: False
+# authserver_enabled: False
+
+# UNMAINTAINED
 # docker_install: False
 # docker_enabled: False
+
+# UNMAINTAINED
+# osm_install: False
+# osm_enabled: False