diff --git a/plugins/chartdldr_pi/data/chart_sources.xml b/plugins/chartdldr_pi/data/chart_sources.xml
index eb37bb681c..e5f3a876e9 100644
--- a/plugins/chartdldr_pi/data/chart_sources.xml
+++ b/plugins/chartdldr_pi/data/chart_sources.xml
@@ -26,421 +26,6 @@
     <section>
       <name>USA - NOAA &amp; Inland charts</name>
       <sections>
-        <section>
-          <name>RNC</name>
-          <sections>
-            <section>
-              <name>All RNCs</name>
-              <catalogs>
-                <catalog>
-                  <name>All</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US</dir>
-                </catalog>
-              </catalogs>
-            </section>
-            <section>
-              <name>by Coast Guard Districts</name>
-              <catalogs>
-                <catalog>
-                  <name>01 CGD - New England states, eastern New York, and northern New Jersey</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/01CGD_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_CGD01</dir>
-                </catalog>
-                <catalog>
-                  <name>05 CGD - Pennsylvania, southern New Jersey, Delaware, Maryland, Virginia, and North Carolina</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/05CGD_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_CGD05</dir>
-                </catalog>
-                <catalog>
-                  <name>07 CGD - South Carolina, Georgia, eastern Florida, Puerto Rico, and the U.S. Virgin Islands</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/07CGD_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_CGD07</dir>
-                </catalog>
-                <catalog>
-                  <name>08 CGD - Inland waters of the U.S. and the Gulf of Mexico</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/08CGD_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_CGD08</dir>
-                </catalog>
-                <catalog>
-                  <name>09 CGD - Great Lakes</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/09CGD_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_CGD09</dir>
-                </catalog>
-                <catalog>
-                  <name>11 CGD - California, Arizona, Nevada, and Utah</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/11CGD_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_CGD11</dir>
-                </catalog>
-                <catalog>
-                  <name>13 CGD - Oregon, Washington, Idaho and Montana</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/13CGD_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_CGD13</dir>
-                </catalog>
-                <catalog>
-                  <name>14 CGD - Hawaii and Pacific territories</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/14CGD_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_CGD14</dir>
-                </catalog>
-                <catalog>
-                  <name>17 CGD - Alaska</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/17CGD_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_CGD17</dir>
-                </catalog>
-              </catalogs>
-            </section>
-            <section>
-              <name>by States</name>
-              <catalogs>
-                <catalog>
-                  <name>AK - Alaska</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/AK_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_AK</dir>
-                </catalog>
-                <catalog>
-                  <name>AL - Alabama</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/AL_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_AL</dir>
-                </catalog>
-                <catalog>
-                  <name>CA - California</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/CA_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_CA</dir>
-                </catalog>
-                <catalog>
-                  <name>CT - Connecticut</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/CT_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_CT</dir>
-                </catalog>
-                <catalog>
-                  <name>DE - Delaware</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/DE_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_DE</dir>
-                </catalog>
-                <catalog>
-                  <name>FL - Florida</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/FL_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_FL</dir>
-                </catalog>
-                <catalog>
-                  <name>GA - Georgia</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/GA_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_GA</dir>
-                </catalog>
-                <catalog>
-                  <name>HI - Hawaii</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/HI_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_HI</dir>
-                </catalog>
-                <catalog>
-                  <name>ID - Idaho</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/ID_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_ID</dir>
-                </catalog>
-                <catalog>
-                  <name>IL - Illinois</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/IL_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_IL</dir>
-                </catalog>
-                <catalog>
-                  <name>IN - Indiana</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/IN_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_IN</dir>
-                </catalog>
-                <catalog>
-                  <name>LA - Louisiana</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/LA_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_LA</dir>
-                </catalog>
-                <catalog>
-                  <name>MA - Massachusetts</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/MA_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_MA</dir>
-                </catalog>
-                <catalog>
-                  <name>MD - Maryland</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/MD_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_MD</dir>
-                </catalog>
-                <catalog>
-                  <name>ME - Maine</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/ME_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_ME</dir>
-                </catalog>
-                <catalog>
-                  <name>MI - Michigan</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/MI_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_MI</dir>
-                </catalog>
-                <catalog>
-                  <name>MN - Minnesota</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/MN_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_MN</dir>
-                </catalog>
-                <catalog>
-                  <name>MS - Mississippi</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/MS_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_MS</dir>
-                </catalog>
-                <catalog>
-                  <name>NC - North Carolina</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/NC_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_NC</dir>
-                </catalog>
-                <catalog>
-                  <name>NH - New Hampshire</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/NH_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_NH</dir>
-                </catalog>
-                <catalog>
-                  <name>NJ - New Jersey</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/NJ_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_NJ</dir>
-                </catalog>
-                <catalog>
-                  <name>NV - Nevada</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/NV_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_NV</dir>
-                </catalog>
-                <catalog>
-                  <name>NY - New York</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/NY_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_NY</dir>
-                </catalog>
-                <catalog>
-                  <name>OH - Ohio</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/OH_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_OH</dir>
-                </catalog>
-                <catalog>
-                  <name>OR - Oregon</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/OR_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_OR</dir>
-                </catalog>
-                <catalog>
-                  <name>PA - Pennsylvania</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/PA_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_PA</dir>
-                </catalog>
-                <catalog>
-                  <name>PO - Pacific Ocean</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/PO_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_PO</dir>
-                </catalog>
-                <catalog>
-                  <name>PR - Puerto Rico and Virgin Islands</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/PR_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_PR</dir>
-                </catalog>
-                <catalog>
-                  <name>RI - Rhode Island</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/RI_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_RI</dir>
-                </catalog>
-                <catalog>
-                  <name>SC - South Carolina</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/SC_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_SC</dir>
-                </catalog>
-                <catalog>
-                  <name>TX - Texas</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/TX_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_TX</dir>
-                </catalog>
-                <catalog>
-                  <name>VA - Virginia</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/VA_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_VA</dir>
-                </catalog>
-                <catalog>
-                  <name>VT - Vermont</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/VT_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_VT</dir>
-                </catalog>
-                <catalog>
-                  <name>WA - Washington</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/WA_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_WA</dir>
-                </catalog>
-                <catalog>
-                  <name>WI - Wisconsin</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/WI_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_WI</dir>
-                </catalog>
-              </catalogs>
-            </section>
-            <section>
-              <name>by Region</name>
-              <catalogs>
-                <catalog>
-                  <name>Region 02 - Block Island, RI to the Canadian Border</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/02Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION02</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 03 - New York to Nantucket and Cape May, NJ</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/03Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION03</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 04 - Chesapeake and Delaware Bays</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/04Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION04</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 06 - Norfolk, VA to Florida including the ICW</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/06Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION06</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 07 - Florida East Coast and the Keys</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/07Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION07</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 08 - Florida West Coast and the Keys</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/08Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION08</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 10 - Puerto Rico and the U.S. Virgin Islands</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/10Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION10</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 12 - Southern California: Point Arena to the Mexican Border</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/12Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION12</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 13 - Lake Michigan</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/13Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION13</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 14 - San Francisco to Cape Flattery</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/14Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION14</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 15 - Pacific Northwest: Puget Sound to the Canadian Border</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/15Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION15</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 17 - Mobile, AL to the Mexican Border</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/17Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION17</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 22 - Lake Superior and Lake Huron (U.S. Waters)</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/22Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION22</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 24 - Lake Erie (U.S. Waters)</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/24Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION24</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 26 - Lake Ontario (U.S. Waters)</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/26Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION26</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 30 - Southeast Alaska</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/30Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION30</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 32 - South Central Alaska: Yakutat to Kodiak</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/32Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION32</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 34 - Alaska: The Aleutians and Bristol Bay</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/34Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION34</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 36 - Alaska: Norton Sound to Beaufort Sea</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/36Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION36</dir>
-                </catalog>
-                <catalog>
-                  <name>Region 40 - Hawaiian Islands and U.S. Territories</name>
-                  <type>RNC</type>
-                  <location>https://www.charts.noaa.gov/RNCs/40Region_RNCProdCat.xml</location>
-                  <dir>{USERDATA}/RNC/US_REGION40</dir>
-                </catalog>
-              </catalogs>
-            </section>
-          </sections>
-        </section>
         <section>
           <name>ENC</name>
           <sections>