diff --git a/Data/AI/FlightPlans/KSFO_ILS28L.xml b/Data/AI/FlightPlans/KSFO_ILS28L.xml
deleted file mode 100644
index b57aa73eb..000000000
--- a/Data/AI/FlightPlans/KSFO_ILS28L.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ILS Runway 28L, KSFO                  
-     Format:                                                         
-       <name>       Waypoint name.  When a waypoint named END is reached
-                    the AI airplane will delete itself.                                       
-       <lat>        latitude, degrees (-90 to 90)                                    
-       <lon>        Longitude, degrees (-180 to 180)                                   
-       <alt>        altitude above sea level, feet                                       
-       <crossat>    Crossing altitude, feet                              
-       <ktas>       Knots true airspeed
-       <on-ground>  Set true is on the ground.  The default value
-                    is false. 
-       <gear-down>  Set true for gear down, false for gear up.
-                    The default value is false.
-       <flaps-down> Set true for flaps down, false for flaps up.
-                    The default value is false.  
--->
- 
-<PropertyList>
-
- <flightplan>
-
-  <wpt>
-   <name>HEMAN</name>
-   <lat>37.53337</lat>
-   <lon>-122.17219</lon>
-   <crossat>3200.0</crossat>
-   <ktas>200</ktas>
-  </wpt>
-
-  <wpt>
-   <name>OKDUE</name>
-   <lat>37.56996</lat>
-   <lon>-122.259008</lon>
-   <crossat>1800.0</crossat>
-   <ktas>150</ktas>
-  </wpt>
-
-  <wpt>
-   <name>28L-touchdown</name>
-   <lat>37.612726</lat>
-   <lon>-122.360828</lon>
-   <crossat>13.0</crossat>
-   <ktas>20</ktas>
-   <on-ground>true</on-ground>
-  </wpt>
-
-  <wpt>
-   <name>turnoff</name>
-   <lat>37.620115</lat>
-   <lon>-122.378371</lon>
-   <crossat>10.7</crossat>
-   <ktas>20</ktas>
-   <on-ground>true</on-ground>
-  </wpt>
-
-  <wpt>
-   <name>END</name>
-   <lat>37.61853</lat>
-   <lon>-122.38182</lon>
-   <crossat>21.8</crossat>
-  </wpt>
-
-  <wpt>
-   <name>EOF</name>
-  </wpt>
-
- </flightplan>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/FlightPlans/KSFO_bigsur28L.xml b/Data/AI/FlightPlans/KSFO_bigsur28L.xml
deleted file mode 100644
index 4da9d65cb..000000000
--- a/Data/AI/FlightPlans/KSFO_bigsur28L.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- BIG SUR ARRIVAL, BSR.BSR2 to KSFO, Runway 28L                  
-     The arrival can be found at http://www.airnav.com/airport/KSFO 
-     Format:                                                         
-       <name>       Waypoint name.  When a waypoint named END is reached
-                    the AI airplane will delete itself.                                       
-       <lat>        latitude, degrees (-90 to 90)                                    
-       <lon>        Longitude, degrees (-180 to 180)                                   
-       <alt>        altitude above sea level, feet                                       
-       <crossat>    Crossing altitude, feet                              
-       <ktas>       Knots true airspeed
-       <on-ground>  Set true is on the ground.  The default value
-                    is false. 
-       <gear-down>  Set true for gear down, false for gear up.
-                    The default value is false.
-       <flaps-down> Set true for flaps down, false for flaps up.
-                    The default value is false.  
--->
- 
-<PropertyList>
-
- <flightplan>
-
-  <wpt>
-   <name>BSR</name>
-   <lat>36.181333</lat>
-   <lon>-121.642166</lon>
-   <alt>26000.0</alt>
-   <ktas>380</ktas>
-  </wpt>
-
-  <wpt>
-   <name>CARME</name>
-   <lat>36.455167</lat>
-   <lon>-121.879666</lon>
-   <crossat>20000.0</crossat>
-   <ktas>350</ktas>
-  </wpt>
-
-  <wpt>
-   <name>BOLDR</name>
-   <lat>37.17087</lat>
-   <lon>-122.0761666</lon>
-   <crossat>10000.0</crossat>
-   <ktas>275</ktas>
-  </wpt>
- 
-  <wpt>
-   <name>MENLO</name>
-   <lat>37.463666</lat>
-   <lon>-122.1536666</lon>
-   <crossat>10000.0</crossat>
-   <ktas>250</ktas>
-  </wpt>
-
-  <wpt>
-   <name>HEMAN</name>
-   <lat>37.53337</lat>
-   <lon>-122.17219</lon>
-   <crossat>3200.0</crossat>
-   <ktas>200</ktas>
-  </wpt>
-
-  <wpt>
-   <name>OKDUE</name>
-   <lat>37.56996</lat>
-   <lon>-122.259008</lon>
-   <crossat>1800.0</crossat>
-   <ktas>150</ktas>
-  </wpt>
-
-  <wpt>
-   <name>28L</name>
-   <lat>37.611707</lat>
-   <lon>-122.35834</lon>
-   <crossat>13.0</crossat>
-   <ktas>20</ktas>
-   <on-ground>true</on-ground>
-  </wpt>
-
-  <wpt>
-   <name>END</name>
-   <lat>37.625288</lat>
-   <lon>-122.390717</lon>
-   <crossat>6.0</crossat>
-  </wpt>
-
-  <wpt>
-   <name>EOF</name>
-  </wpt>
-
- </flightplan>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/FlightPlans/KSFO_depart_east_01R.xml b/Data/AI/FlightPlans/KSFO_depart_east_01R.xml
deleted file mode 100644
index bd6464ca9..000000000
--- a/Data/AI/FlightPlans/KSFO_depart_east_01R.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Depart KSFO to the east over OAK and LIN                  
-     The departure can be found at http://www.airnav.com/airport/KSFO 
-     Format:                                                         
-       <name>       Waypoint name.  When a waypoint named END is reached
-                    the AI airplane will delete itself.                                       
-       <lat>        latitude, degrees (-90 to 90)                                    
-       <lon>        Longitude, degrees (-180 to 180)                                   
-       <alt>        altitude above sea level, feet                                       
-       <crossat>    Crossing altitude, feet                              
-       <ktas>       Knots true airspeed
-       <on-ground>  set true if on the ground
-       <gear-down>  set true for gear down, false for gear up
-       <flaps-down> set true for flaps down, false for flaps up
--->
- 
-<PropertyList>
-
- <flightplan>
-
-  <wpt>
-   <name>01R</name>
-   <lat>37.606844</lat>
-   <lon>-122.380667</lon>
-   <alt>11.0</alt>
-   <ktas>20</ktas>
-   <on-ground>true</on-ground>
-   <gear-down>true</gear-down>
-  </wpt>
-
-  <wpt>
-   <name>accel</name>
-   <lat>37.607269</lat>
-   <lon>-122.380391</lon>
-   <alt>11.0</alt>
-   <ktas>150</ktas>
-   <on-ground>true</on-ground>
-  </wpt>
-
-  <wpt>
-   <name>rotate</name>
-   <lat>37.618127</lat>
-   <lon>-122.373221</lon>
-   <alt>400.0</alt>
-   <ktas>180</ktas>
-   <gear-down>false</gear-down>
-  </wpt>
-
-  <wpt>
-   <name>runway-end</name>
-   <lat>37.626579</lat>
-   <lon>-122.367638</lon>
-   <alt>10000.0</alt>
-   <ktas>280</ktas>
-  </wpt>
-
-  <wpt>
-   <name>OAK</name>  <!-- Oakland VOR, 116.8 -->
-   <lat>37.726</lat>
-   <lon>-122.223667</lon>
-   <alt>30000.0</alt>
-   <ktas>360</ktas>
-  </wpt>
-
-  <wpt>
-   <name>END</name>  <!-- Linden VOR, 114.8 -->
-   <lat>38.0745</lat>
-   <lon>-121.00383</lon>
-   <crossat>30000.0</crossat>
-  </wpt>
-
-  <wpt>
-   <name>EOF</name>
-  </wpt>
-
- </flightplan>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/FlightPlans/KSFO_depart_south_01L.xml b/Data/AI/FlightPlans/KSFO_depart_south_01L.xml
deleted file mode 100644
index 362e5e6f4..000000000
--- a/Data/AI/FlightPlans/KSFO_depart_south_01L.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Based on the Porte departure at KSFO, left turnout to WAGES                  
-     The departure can be found at http://www.airnav.com/airport/KSFO 
-     Format:                                                         
-       <name>       Waypoint name.  When a waypoint named END is reached
-                    the AI airplane will delete itself.                                       
-       <lat>        latitude, degrees (-90 to 90)                                    
-       <lon>        Longitude, degrees (-180 to 180)                                   
-       <alt>        altitude above sea level, feet                                       
-       <crossat>    Crossing altitude, feet                              
-       <ktas>       Knots true airspeed
-       <on-ground>  set true if on the ground
-       <gear-down>  set true for gear down, false for gear up
-       <flaps-down> set true for flaps down, false for flaps up
--->
- 
-<PropertyList>
-
- <flightplan>
-
-  <wpt>
-   <name>01L</name>
-   <lat>37.609015</lat>
-   <lon>-122.382153</lon>
-   <alt>11.0</alt>
-   <ktas>20</ktas>
-   <on-ground>true</on-ground>
-   <gear-down>true</gear-down>
-  </wpt>
-
-  <wpt>
-   <name>accel</name>
-   <lat>37.6093</lat>
-   <lon>-122.381964</lon>
-   <alt>11.0</alt>
-   <ktas>150</ktas>
-   <on-ground>true</on-ground>
-  </wpt>
-
-  <wpt>
-   <name>rotate</name>
-   <lat>37.61971</lat>
-   <lon>-122.375098</lon>
-   <alt>400.0</alt>
-   <ktas>180</ktas>
-   <gear-down>false</gear-down>
-  </wpt>
-
-  <wpt>
-   <name>runway-end</name>
-   <lat>37.626773</lat>
-   <lon>-122.370432</lon>
-   <alt>30000.0</alt>
-   <ktas>225</ktas>
-  </wpt>
-
-  <wpt>
-   <name>SFO350at4</name>  <!-- SFO 350/04, 115.8 -->
-   <lat>37.685667</lat>
-   <lon>-122.363667</lon>
-   <alt>30000.0</alt>
-   <ktas>225</ktas>
-  </wpt>
-
-  <wpt>
-   <name>turn1</name>  
-   <lat>37.693788</lat>
-   <lon>-122.384405</lon>
-   <alt>30000.0</alt>
-   <ktas>225</ktas>
-  </wpt>
-
-  <wpt>
-   <name>turn2</name>  
-   <lat>37.6665</lat>
-   <lon>-122.5</lon>
-   <alt>30000.0</alt>
-   <ktas>265</ktas>
-  </wpt>
-
-  <wpt>
-   <name>PORTE</name>  
-   <lat>37.4898333</lat>
-   <lon>-122.4745</lon>
-   <alt>30000.0</alt>
-   <ktas>350</ktas>
-  </wpt>
-
-  <wpt>
-   <name>PESCA</name>  
-   <lat>37.2681667</lat>
-   <lon>-122.3286667</lon>
-   <alt>30000.0</alt>
-   <ktas>370</ktas>
-  </wpt>
-
-  <wpt>
-   <name>END</name>   <!-- WAGES intersection, OSI 116/36, 113.9  -->  
-   <lat>36.991</lat>
-   <lon>-121.737</lon>
-  </wpt>
-
-  <wpt>
-   <name>EOF</name>
-  </wpt>
-
- </flightplan>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/FlightPlans/KSFO_depart_south_28L.xml b/Data/AI/FlightPlans/KSFO_depart_south_28L.xml
deleted file mode 100644
index 61045527b..000000000
--- a/Data/AI/FlightPlans/KSFO_depart_south_28L.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Based on the Porte departure at KSFO, left turnout to WAGES                  
-     The departure can be found at http://www.airnav.com/airport/KSFO 
-     Format:                                                         
-       <name>       Waypoint name.  When a waypoint named END is reached
-                    the AI airplane will delete itself.                                       
-       <lat>        latitude, degrees (-90 to 90)                                    
-       <lon>        Longitude, degrees (-180 to 180)                                   
-       <alt>        altitude above sea level, feet                                       
-       <crossat>    Crossing altitude, feet                              
-       <ktas>       Knots true airspeed
-       <on-ground>  set true if on the ground
-       <gear-down>  set true for gear down, false for gear up
-       <flaps-down> set true for flaps down, false for flaps up
--->
- 
-<PropertyList>
-
- <flightplan>
-
-  <wpt>
-   <name>28L</name>
-   <lat>37.611716</lat>
-   <lon>-122.358434</lon>
-   <alt>13.0</alt>
-   <ktas>20</ktas>
-   <on-ground>true</on-ground>
-   <gear-down>true</gear-down>
-  </wpt>
-
-  <wpt>
-   <name>accel</name>
-   <lat>37.611772</lat>
-   <lon>-122.358569</lon>
-   <alt>13.0</alt>
-   <ktas>150</ktas>
-   <on-ground>true</on-ground>
-  </wpt>
-
-  <wpt>
-   <name>rotate</name>
-   <lat>37.617969</lat>
-   <lon>-122.37327</lon>
-   <alt>30000.0</alt>
-   <ktas>200</ktas>
-   <gear-down>false</gear-down>
-  </wpt>
-
-  <wpt>
-   <name>runway-end</name>
-   <lat>37.625241</lat>
-   <lon>-122.390523</lon>
-   <alt>30000.0</alt>
-   <ktas>240</ktas>
-  </wpt>
-
-  <wpt>
-   <name>first_fix</name> 
-   <lat>37.608134</lat>
-   <lon>-122.460712</lon>
-   <alt>30000.0</alt>
-   <ktas>270</ktas>
-  </wpt>
-
-  <wpt>
-   <name>second_fix</name>  
-   <lat>37.527346</lat>
-   <lon>-122.47883</lon>
-   <alt>30000.0</alt>
-   <ktas>320</ktas>
-  </wpt>
-
-  <wpt>
-   <name>PESCA</name>  
-   <lat>37.2681667</lat>
-   <lon>-122.3286667</lon>
-   <alt>30000.0</alt>
-   <ktas>370</ktas>
-  </wpt>
-
-  <wpt>
-   <name>END</name>   <!-- WAGES intersection, OSI 116/36, 113.9  -->  
-   <lat>36.991</lat>
-   <lon>-121.737</lon>
-  </wpt>
-
-  <wpt>
-   <name>EOF</name>
-  </wpt>
-
- </flightplan>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/FlightPlans/KSFO_goldengate28L.xml b/Data/AI/FlightPlans/KSFO_goldengate28L.xml
deleted file mode 100644
index 688d676d3..000000000
--- a/Data/AI/FlightPlans/KSFO_goldengate28L.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Golden Gate Arrival to KSFO, left base to Runway 28L                  
-     The arrival can be found at http://www.airnav.com/airport/KSFO 
-     Format:                                                         
-       <name>       Waypoint name.  When a waypoint named END is reached
-                    the AI airplane will delete itself.                                       
-       <lat>        latitude, degrees (-90 to 90)                                    
-       <lon>        Longitude, degrees (-180 to 180)                                   
-       <alt>        altitude above sea level, feet                                       
-       <crossat>    Crossing altitude, feet                              
-       <ktas>       Knots true airspeed
-       <on-ground>  set true if on the ground
-       <gear-down>  set true for gear down, false for gear up
-       <flaps-down> set true for flaps down, false for flaps up
--->
- 
-<PropertyList>
-
- <flightplan>
-
-  <wpt>
-   <name>ENI</name>  <!-- mendocino VOR, 112.3 -->
-   <lat>39.053167</lat>
-   <lon>-123.274167</lon>
-   <alt>26000.0</alt>
-   <ktas>380</ktas>
-  </wpt>
-
-  <wpt>
-   <name>PYE</name>  <!-- point reyes VOR, 113.7 -->
-   <lat>38.079667</lat>
-   <lon>-122.867833</lon>
-   <crossat>20000.0</crossat>
-   <ktas>350</ktas>
-  </wpt>
-
-  <wpt>
-   <name>LOZIT</name>
-   <lat>37.899333</lat>
-   <lon>-122.673167</lon>
-   <crossat>11000.0</crossat>
-   <ktas>260</ktas>
-  </wpt>
- 
-  <wpt>
-   <name>SFO</name>
-   <lat>37.6195</lat>
-   <lon>-122.373833</lon>
-   <crossat>8000.0</crossat>
-   <ktas>210</ktas>
-  </wpt>
-
-  <wpt>
-   <name>base</name>
-   <lat>37.45337</lat>
-   <lon>-122.1932</lon>
-   <crossat>5000.0</crossat>
-   <ktas>200</ktas>
-  </wpt>
-
-  <wpt>
-   <name>dogleg</name>
-   <lat>37.49</lat>
-   <lon>-122.0813</lon>
-   <crossat>4000.0</crossat>
-   <ktas>180</ktas>
-  </wpt>
-
-  <wpt>
-   <name>HEMAN</name>
-   <lat>37.53337</lat>
-   <lon>-122.17219</lon>
-   <crossat>3200.0</crossat>
-   <ktas>170</ktas>
-  </wpt>
-
-  <wpt>
-   <name>OAKDUE</name>
-   <lat>37.56996</lat>
-   <lon>-122.259008</lon>
-   <crossat>1800.0</crossat>
-   <ktas>140</ktas>
-  </wpt>
-
-  <wpt>
-   <name>28L</name>
-   <lat>37.611707</lat>
-   <lon>-122.35834</lon>
-   <crossat>13.0</crossat>
-   <ktas>20</ktas>
-   <on-ground>true</on-ground>
-  </wpt>
-
-  <wpt>
-   <name>END</name>
-   <lat>37.625288</lat>
-   <lon>-122.390717</lon>
-   <crossat>6.0</crossat>
-  </wpt>
-
-  <wpt>
-   <name>EOF</name>
-  </wpt>
-
- </flightplan>
-
-</PropertyList>
diff --git a/Data/AI/FlightPlans/KSFO_modesto28R.xml b/Data/AI/FlightPlans/KSFO_modesto28R.xml
deleted file mode 100644
index cb330f513..000000000
--- a/Data/AI/FlightPlans/KSFO_modesto28R.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- MODESTO ARRIVAL, to KSFO, Runway 28R                  
-     The arrival can be found at http://www.airnav.com/airport/KSFO 
-     Format:                                                         
-       <name>       Waypoint name.  When a waypoint named END is reached
-                    the AI airplane will delete itself.                                       
-       <lat>        latitude, degrees (-90 to 90)                                    
-       <lon>        Longitude, degrees (-180 to 180)                                   
-       <alt>        altitude above sea level, feet                                       
-       <crossat>    Crossing altitude, feet                              
-       <ktas>       Knots true airspeed
-       <on-ground>  set true if on the ground
-       <gear-down>  set true for gear down, false for gear up
-       <flaps-down> set true for flaps down, false for flaps up
--->
- 
-<PropertyList>
-
- <flightplan>
-
-  <wpt>
-   <name>MOD</name>
-   <lat>37.627333</lat>
-   <lon>-120.957833</lon>
-   <alt>20000.0</alt>
-   <ktas>350</ktas>
-  </wpt>
-
-  <wpt>
-   <name>GROAN</name>
-   <lat>37.590333</lat>
-   <lon>-121.285167</lon>
-   <crossat>15000.0</crossat>
-   <ktas>310</ktas>
-  </wpt>
-
-  <wpt>
-   <name>CEDES</name>
-   <lat>37.550833</lat>
-   <lon>-121.624667</lon>
-   <crossat>11000.0</crossat>
-   <ktas>260</ktas>
-  </wpt>
- 
-  <wpt>
-   <name>FAITH</name>
-   <lat>37.401167</lat>
-   <lon>-121.861833</lon>
-   <crossat>5500.0</crossat>
-   <ktas>190</ktas>
-  </wpt>
-
-  <wpt>
-   <name>DUMBA</name>
-   <lat>37.503517</lat>
-   <lon>-122.096147</lon>
-   <crossat>4100.0</crossat>
-   <ktas>170</ktas>
-  </wpt>
-
-  <wpt>
-   <name>AXMUL</name>
-   <lat>37.571725</lat>
-   <lon>-122.257717</lon>
-   <crossat>1800.0</crossat>
-   <ktas>140</ktas>
-  </wpt>
-
-  <wpt>
-   <name>28R</name>
-   <lat>37.61353</lat>
-   <lon>-122.357138</lon>
-   <crossat>13.0</crossat>
-   <ktas>20</ktas>
-   <on-ground>true</on-ground>
-  </wpt>
-
-  <wpt>
-   <name>END</name>
-   <lat>37.628735</lat>
-   <lon>-122.393389</lon>
-   <crossat>6.0</crossat>
-  </wpt>
-
-  <wpt>
-   <name>EOF</name>
-  </wpt>
-
- </flightplan>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/aircraft_demo.xml b/Data/AI/aircraft_demo.xml
deleted file mode 100644
index 40d833c77..000000000
--- a/Data/AI/aircraft_demo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Notes:
-
-     This scenario has a 737 takeoff from runway 28L at KSFO
-     and fly the Porte Departure to the south.  You can change
-     the aircraft type by substituting another model in the
-     <model> tag, and you can also change the "flight plan" by
-     changing the <flightplan> tag. Look in the subdirectory 
-     FlightPlans to find some that I've already defined, including
-     some arrivals.  Normally, when an AI aircraft gets to the end 
-     of its flight plan it deletes itself, however the 
-     <repeat>1</repeat> tag will cause the AI aircraft to start again
-     indefinitely. 
-
-     Dave Culp, davidculp2@comcast.net
-
--->
-
-<PropertyList>
-
- <scenario>
-
-  <entry>
-   <callsign>United 720</callsign>
-   <type>aircraft</type>
-   <class>jet_transport</class>
-   <model>Aircraft/737/Models/boeing733.xml</model>
-   <flightplan>KSFO_depart_south_28L.xml</flightplan>
-   <repeat>1</repeat>
-  </entry>
-
- </scenario>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/bigstorm_demo.xml b/Data/AI/bigstorm_demo.xml
deleted file mode 100644
index 2f67ddc42..000000000
--- a/Data/AI/bigstorm_demo.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Notes:
-
-     This scenario puts a thunderstorm with lightning and 
-     turbulence over San Francisco at 5000 feet MSL.  The 
-     "bottom" of the thunderstorm is at 5000 feet, with parts
-     extending above and rain below it.  The storm is moving on
-     a true heading of 100 degrees, at a ground speed of 25 knots.
-
-     The AI thunderstorm contains a cylindrical zone of turbulence,
-     with a diameter set by <diameter-ft>, a top set by <height-msl>,
-     a bottom equal to <altitude> minus 1000 feet, and a strength
-     set by <strength-norm>.  It does not interact with terrain. 
-
-     Dave Culp, davidculp2@comcast.net 
--->
-
-<PropertyList>
-
- <scenario>
-
-  <entry>
-   <type>thunderstorm</type>
-   <model>Models/Weather/bigstorm.xml</model>
-   <latitude>37.7</latitude>
-   <longitude>-122.5</longitude>
-   <speed>25.0</speed>
-   <altitude>5000.0</altitude>
-   <heading>100.0</heading>
-   <diameter-ft>21048.0</diameter-ft>
-   <height-msl>38000.0</height-msl>
-   <strength-norm>1.0</strength-norm>
-  </entry>
-
- </scenario>
-
-</PropertyList>
diff --git a/Data/AI/nimitz_demo.xml b/Data/AI/nimitz_demo.xml
deleted file mode 100644
index f37a33ef9..000000000
--- a/Data/AI/nimitz_demo.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    x, y, z-offset-m   The distance in meters of the Fresnel Lens Optical Landing System
-                       (FLOLS) from the carrier model origin.
-    max-lat, min-lat   Defines an operating box in terms of the max and min lat
-                       excursions from the start position
-    max-lon, min-lon   Defines an operating box in terms of the max and min lon
-                       excursions from the start position
-    tacan-channel-ID>  Defines a TACAN channel for display purposes only
-
--->
-  <PropertyList>
-    <scenario>
-      <entry>
-        <type>carrier</type>
-        <name>Nimitz</name>
-        <pennant-number>CVN-68</pennant-number>
-        <TACAN-channel-ID>029Y</TACAN-channel-ID>
-        <model>Models/Geometry/Nimitz/nimitz.xml</model>
-        <wire>wire-1</wire>
-        <wire>wire-2</wire>
-        <wire>wire-3</wire>
-        <wire>wire-4</wire>
-        <catapult>cat-1</catapult>
-        <catapult>cat-2</catapult>
-        <catapult>cat-3</catapult>
-        <catapult>cat-4</catapult>
-        <!---->
-        <solid>Deck-1</solid>
-        <solid>Deck-2</solid>
-        <solid>Deck-3</solid>
-        <solid>Deck-4</solid>
-        <solid>Deck-5</solid>
-        <solid>Deck-6</solid>
-        <solid>Deck-7</solid>
-        <solid>Deck-8</solid>
-        <solid>Round-down</solid>
-        <solid>Elevator-1-Deck</solid>
-        <solid>Elevator-2-Deck</solid>
-        <solid>Elevator-3-Deck</solid>
-        <solid>Elevator-4-Deck</solid>
-        <latitude>37.8</latitude>
-        <longitude>-122.6</longitude>
-        <speed>10</speed>
-        <heading>200</heading>
-        <rudder>0</rudder>
-        <turn-radius-ft>6000</turn-radius-ft>
-        <flols-pos>
-          <x-offset-m>69.84</x-offset-m>
-          <y-offset-m>-39.67</y-offset-m>
-          <z-offset-m>21.47</z-offset-m>
-        </flols-pos>
-        <parking-pos>
-          <name>cat-2</name>
-          <heading-offset-deg>-1</heading-offset-deg>
-          <x-offset-m>1.60851</x-offset-m>
-          <y-offset-m>26</y-offset-m>
-          <z-offset-m>-4.9159</z-offset-m>
-        </parking-pos>
-        <parking-pos>
-          <name>cat-1</name>
-          <heading-offset-deg>-9</heading-offset-deg>
-          <x-offset-m>0.0401001</x-offset-m>
-          <y-offset-m>26</y-offset-m>
-          <z-offset-m>17</z-offset-m>
-        </parking-pos>
-        <parking-pos>
-          <name>park-1</name>
-          <heading-offset-deg>-90</heading-offset-deg>
-          <x-offset-m>54.33</x-offset-m>
-          <y-offset-m>26</y-offset-m>
-          <z-offset-m>20</z-offset-m>
-        </parking-pos>
-        <max-lat>0.01</max-lat>
-        <min-lat>0.05</min-lat>
-        <max-long>0.05</max-long>
-        <min-long>0.01</min-long>
-      </entry>
-      <entry>
-        <type>carrier</type>
-        <name>Eisenhower</name>
-        <pennant-number>CVN-69</pennant-number>
-        <TACAN-channel-ID>030Y</TACAN-channel-ID>
-        <model>Models/Geometry/Nimitz/eisenhower.xml</model>
-        <wire>wire-1</wire>
-        <wire>wire-2</wire>
-        <wire>wire-3</wire>
-        <wire>wire-4</wire>
-        <catapult>cat-1</catapult>
-        <catapult>cat-2</catapult>
-        <catapult>cat-3</catapult>
-        <catapult>cat-4</catapult>
-        <solid>Deck-1</solid>
-        <solid>Deck-2</solid>
-        <solid>Deck-3</solid>
-        <solid>Deck-4</solid>
-        <solid>Deck-5</solid>
-        <solid>Deck-6</solid>
-        <solid>Deck-7</solid>
-        <solid>Deck-8</solid>
-        <solid>Round-down</solid>
-        <solid>Elevator-1-Deck</solid>
-        <solid>Elevator-2-Deck</solid>
-        <solid>Elevator-3-Deck</solid>
-        <solid>Elevator-4-Deck</solid>
-        <solid>Door-Fairing-2</solid>
-        <solid>Door-Fairing-3</solid>
-        <solid>Hangar</solid>
-        <latitude>43.0140</latitude>
-        <longitude>3.3587</longitude>
-        <speed>10</speed>
-        <heading>200</heading>
-        <rudder>0</rudder>
-        <turn-radius-ft>6000</turn-radius-ft>
-        <flols-pos>
-          <x-offset-m>69.84</x-offset-m>
-          <y-offset-m>-39.67</y-offset-m>
-          <z-offset-m>21.47</z-offset-m>
-        </flols-pos>
-        <parking-pos>
-          <name>cat-2</name>
-          <heading-offset-deg>-1</heading-offset-deg>
-          <x-offset-m>1.60851</x-offset-m>
-          <y-offset-m>26</y-offset-m>
-          <z-offset-m>-4.9159</z-offset-m>
-        </parking-pos>
-        <parking-pos>
-          <name>cat-1</name>
-          <heading-offset-deg>-9</heading-offset-deg>
-          <x-offset-m>0.0401001</x-offset-m>
-          <y-offset-m>26</y-offset-m>
-          <z-offset-m>17</z-offset-m>
-        </parking-pos>
-        <parking-pos>
-          <name>park-1</name>
-          <heading-offset-deg>-90</heading-offset-deg>
-          <x-offset-m>54.33</x-offset-m>
-          <y-offset-m>26</y-offset-m>
-          <z-offset-m>20</z-offset-m>
-        </parking-pos>
-        <max-lat>0.01</max-lat>
-        <min-lat>0.05</min-lat>
-        <max-long>0.05</max-long>
-        <min-long>0.01</min-long>
-      </entry>
-    </scenario>
-  </PropertyList>
diff --git a/Data/AI/refueling_demo.xml b/Data/AI/refueling_demo.xml
deleted file mode 100644
index bd1d88420..000000000
--- a/Data/AI/refueling_demo.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Notes:
-
-     The following scenario puts an aerial tanker in orbit over KSFO
-     at 3000 ft AGL. The tanker uses the 737 model, but you can use any
-     model (a KC-135 model can be found at:
-     http://home.comcast.net/~davidculp2/hangar/hangar.html).
-     The center of the orbit is actually west of KSFO, and the eastern
-     edge of the orbit passes over the airport.  Note that AI aircraft
-     do not react to wind, therefore your speed and bank angle will have
-     to vary along the orbit since your "user" aircraft *does* react to
-     the wind.
-
-     I recommend using the T-38 as your airplane for four reasons: (1) it
-     has a radar screen which may be needed to find the tanker;  (2) it
-     has the speed to catch the tanker; (3) it uses a JSBSim FDM, which
-     means it can onload fuel; (4) it has a green light added to the
-     instrument panel, between the fuel gauges, which comes on when you
-     are in the refueling envelope.
-
-     Right now the air refueling envelope is very loose, and I plan on
-     tightening it up in the future.  Currently no aerodynamic effects
-     of refueling are modeled (i.e downwash, bow wave, vortices).
-
-     Dave Culp,  davidculp2@comcast.net
--->
- 
-<PropertyList>
-
- <scenario>
-
-  <entry>
-   <callsign>Esso 1</callsign>
-   <type>aircraft</type>
-   <class>tanker</class>
-   <model>Aircraft/737/Models/boeing733.xml</model>
-   <latitude>37.61633</latitude>
-   <longitude>-122.38334</longitude>
-   <altitude>3000</altitude>
-   <heading>020</heading>
-   <speed>280</speed>
-   <roll>-15</roll>
-  </entry>
-
- </scenario>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/ship_demo.xml b/Data/AI/ship_demo.xml
deleted file mode 100644
index 499a09b31..000000000
--- a/Data/AI/ship_demo.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Notes:
-
-     This scenario puts a sailboat in the bay just east
-     of KSFO.  The <rudder> tag works similarly to the
-     <bank> tag for AI aircraft, except that the ship will
-     turn but not bank (i.e. will not heel).  Use small
-     values for <rudder> for best effect.
-
-     Dave Culp, davidculp2@comcast.net
--->
-
-<PropertyList>
-
- <scenario>
-
-  <entry>
-   <type>ship</type>
-   <model>Models/Geometry/sailboat.xml</model>
-   <latitude>37.63</latitude>
-   <longitude>-122.34</longitude>
-   <speed>6.0</speed>
-   <rudder>3.0</rudder>
-  </entry>
-
- </scenario>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/thermal_demo.xml b/Data/AI/thermal_demo.xml
deleted file mode 100644
index 25fc1b929..000000000
--- a/Data/AI/thermal_demo.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Notes:
-
-     This scenario puts a thermal over the tower at KSFO.
-     The <height> tag defines the upper limit of the thermal.
-     AI thermals have some limitations, i.e. they don't lean
-     downwind, they are only cylindrical in shape, they don't
-     interact with the terrain or weather, and AFAIK they only
-     work with the JSBSim FDM.  Try using the sgs233 model for
-     a good demonstration.
-
-     Dave Culp, davidculp2@comcast.net
--->
- 
-<PropertyList>
-
- <scenario>
-
-  <entry>
-   <type>thermal</type>
-   <latitude>37.61633</latitude>
-   <longitude>-122.38334</longitude>
-   <strength-fps>13.49</strength-fps>
-   <diameter-ft>4800.0</diameter-ft>
-   <height-msl>5000</height-msl>
-  </entry>
-
- </scenario>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/thunderstorm_demo.xml b/Data/AI/thunderstorm_demo.xml
deleted file mode 100644
index 5dbba48aa..000000000
--- a/Data/AI/thunderstorm_demo.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Notes:
-
-     This scenario puts a thunderstorm over San Francisco 
-     at 4000 feet MSL.  The "waist" of the thunderstorm is at
-     4000 feet, with parts extending above and below it.  The
-     storm is moving on a true heading of 100 degrees, at a
-     ground speed of 25 knots.  AI thunderstorms do not (yet)
-     interact with the "user" airplane.  It also does not
-     interact with terrain. 
-
-     Dave Culp, davidculp2@comcast.net 
--->
-
-<PropertyList>
-
- <scenario>
-
-  <entry>
-   <type>thunderstorm</type>
-   <model>Models/Weather/thunderstorm.xml</model>
-   <latitude>37.7</latitude>
-   <longitude>-122.5</longitude>
-   <speed>25.0</speed>
-   <altitude>4000.0</altitude>
-   <heading>100.0</heading>
-  </entry>
-
- </scenario>
-
-</PropertyList>