diff --git a/src/Instrumentation/adf.cxx b/src/Instrumentation/adf.cxx
index d4f646220..e5303db01 100644
--- a/src/Instrumentation/adf.cxx
+++ b/src/Instrumentation/adf.cxx
@@ -131,8 +131,6 @@ ADF::init ()
     std::ostringstream temp;
     temp << name << num;
     adf_ident = temp.str();
-
-    _serviceable_node->setBoolValue(true);
 }
 
 void
diff --git a/src/Instrumentation/airspeed_indicator.cxx b/src/Instrumentation/airspeed_indicator.cxx
index dbec719fa..db34f3fce 100644
--- a/src/Instrumentation/airspeed_indicator.cxx
+++ b/src/Instrumentation/airspeed_indicator.cxx
@@ -73,8 +73,6 @@ AirspeedIndicator::init ()
     _static_pressure_node = fgGetNode(static_port.c_str(), true);
     _density_node = fgGetNode("/environment/density-slugft3", true);
     _speed_node = node->getChild("indicated-speed-kt", 0, true);
-
-    _serviceable_node->setBoolValue(true);
 }
 
 #ifndef FPSTOKTS
diff --git a/src/Instrumentation/altimeter.cxx b/src/Instrumentation/altimeter.cxx
index 2a82ee7a0..5b7e3decc 100644
--- a/src/Instrumentation/altimeter.cxx
+++ b/src/Instrumentation/altimeter.cxx
@@ -100,9 +100,6 @@ Altimeter::init ()
     _setting_node = node->getChild("setting-inhg", 0, true);
     _pressure_node = fgGetNode(static_port.c_str(), true);
     _altitude_node = node->getChild("indicated-altitude-ft", 0, true);
-
-    _serviceable_node->setBoolValue(true);
-    _setting_node->setDoubleValue(29.92);
 }
 
 void
diff --git a/src/Instrumentation/attitude_indicator.cxx b/src/Instrumentation/attitude_indicator.cxx
index d958de25d..d57947663 100644
--- a/src/Instrumentation/attitude_indicator.cxx
+++ b/src/Instrumentation/attitude_indicator.cxx
@@ -67,8 +67,6 @@ AttitudeIndicator::init ()
     _roll_int_node = node->getChild("internal-roll-deg", 0, true);
     _pitch_out_node = node->getChild("indicated-pitch-deg", 0, true);
     _roll_out_node = node->getChild("indicated-roll-deg", 0, true);
-
-    //_serviceable_node->setBoolValue(true);
 }
 
 void
diff --git a/src/Instrumentation/clock.cxx b/src/Instrumentation/clock.cxx
index b850d18eb..1b5808fb4 100644
--- a/src/Instrumentation/clock.cxx
+++ b/src/Instrumentation/clock.cxx
@@ -66,8 +66,6 @@ Clock::init ()
     _offset_node = node->getChild("offset-sec", 0, true);
     _sec_node = node->getChild("indicated-sec", 0, true);
     _string_node = node->getChild("indicated-string", 0, true);
-
-    _serviceable_node->setBoolValue(true);
 }
 
 void
diff --git a/src/Instrumentation/dme.cxx b/src/Instrumentation/dme.cxx
index 6c4d08d71..7915ea5eb 100644
--- a/src/Instrumentation/dme.cxx
+++ b/src/Instrumentation/dme.cxx
@@ -100,8 +100,6 @@ DME::init ()
     _distance_node = node->getChild("indicated-distance-nm", 0, true);
     _speed_node = node->getChild("indicated-ground-speed-kt", 0, true);
     _time_node = node->getChild("indicated-time-min", 0, true);
-
-    _serviceable_node->setBoolValue(true);
 }
 
 void
diff --git a/src/Instrumentation/encoder.cxx b/src/Instrumentation/encoder.cxx
index 0c1517aec..fa01c40ea 100644
--- a/src/Instrumentation/encoder.cxx
+++ b/src/Instrumentation/encoder.cxx
@@ -112,8 +112,6 @@ void Encoder::init()
     // Outputs
     pressureAltitudeNode = node->getChild("pressure-alt-ft", 0, true);
     modeCAltitudeNode = node->getChild("mode-c-alt-ft", 0, true);
-    // Init
-    serviceableNode->setBoolValue(true);
 }
 
 
diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx
index 5ebfafcba..b8dcb6d58 100644
--- a/src/Instrumentation/gps.cxx
+++ b/src/Instrumentation/gps.cxx
@@ -692,6 +692,7 @@ GPS::update (double delta_time_sec)
             popWp->setBoolValue(false);
 
             route->delete_first();
+	    _route->removeChild("Waypoint", 0, false);
         }
 
     } else {
diff --git a/src/Instrumentation/heading_indicator.cxx b/src/Instrumentation/heading_indicator.cxx
index 8878e3ba1..9c2877cf2 100644
--- a/src/Instrumentation/heading_indicator.cxx
+++ b/src/Instrumentation/heading_indicator.cxx
@@ -56,8 +56,6 @@ HeadingIndicator::init ()
     _heading_out_node = node->getChild("indicated-heading-deg", 0, true);
     _last_heading_deg = (_heading_in_node->getDoubleValue() +
                          _offset_node->getDoubleValue());
-
-    //_serviceable_node->setBoolValue(true);
 }
 
 void
diff --git a/src/Instrumentation/kr_87.cxx b/src/Instrumentation/kr_87.cxx
index d0c81c8ba..58e358d7a 100644
--- a/src/Instrumentation/kr_87.cxx
+++ b/src/Instrumentation/kr_87.cxx
@@ -114,7 +114,6 @@ FGKR_87::~FGKR_87() {
 
 
 void FGKR_87::init () {
-    serviceable->setBoolValue( true );
     morse.init();
 }
 
diff --git a/src/Instrumentation/slip_skid_ball.cxx b/src/Instrumentation/slip_skid_ball.cxx
index ba470bd1c..8b79f4f63 100644
--- a/src/Instrumentation/slip_skid_ball.cxx
+++ b/src/Instrumentation/slip_skid_ball.cxx
@@ -51,8 +51,6 @@ SlipSkidBall::init ()
     _z_accel_node = fgGetNode("/accelerations/pilot/z-accel-fps_sec", true);
     _out_node = node->getChild("indicated-slip-skid", 0, true);
     _override_node = node->getChild("iverride", 0, true);
-
-    _serviceable_node->setBoolValue(true);
 }
 
 void
diff --git a/src/Instrumentation/transponder.cxx b/src/Instrumentation/transponder.cxx
index 882bd160a..a3b62f510 100644
--- a/src/Instrumentation/transponder.cxx
+++ b/src/Instrumentation/transponder.cxx
@@ -71,8 +71,6 @@ void Transponder::init()
     // Outputs
     idCodeNode = node->getChild("id-code", 0, true);
     flightLevelNode = node->getChild("flight-level", 0, true);
-    // Init
-    serviceableNode->setBoolValue(true);
 }
 
 
diff --git a/src/Instrumentation/turn_indicator.cxx b/src/Instrumentation/turn_indicator.cxx
index 6eab60a49..2a4565790 100644
--- a/src/Instrumentation/turn_indicator.cxx
+++ b/src/Instrumentation/turn_indicator.cxx
@@ -57,9 +57,6 @@ TurnIndicator::init ()
     _electric_current_node = 
         fgGetNode("/systems/electrical/outputs/turn-coordinator", true);
     _rate_out_node = node->getChild("indicated-turn-rate", 0, true);
-
-    //_serviceable_node->setBoolValue(true);
-    
 }
 
 void
diff --git a/src/Instrumentation/vertical_speed_indicator.cxx b/src/Instrumentation/vertical_speed_indicator.cxx
index fb2924600..2188637e0 100644
--- a/src/Instrumentation/vertical_speed_indicator.cxx
+++ b/src/Instrumentation/vertical_speed_indicator.cxx
@@ -57,7 +57,6 @@ VerticalSpeedIndicator::init ()
     _pressure_node = fgGetNode(static_port.c_str(), true);
     _speed_node = node->getChild("indicated-speed-fpm", 0, true);
 
-    _serviceable_node->setBoolValue(true);
                                 // Initialize at ambient pressure
     _internal_pressure_inhg = _pressure_node->getDoubleValue();
 }
diff --git a/src/Systems/pitot.cxx b/src/Systems/pitot.cxx
index 7201e4f5d..3851f53fd 100644
--- a/src/Systems/pitot.cxx
+++ b/src/Systems/pitot.cxx
@@ -54,8 +54,6 @@ PitotSystem::init ()
     _density_node = fgGetNode("/environment/density-slugft3", true);
     _velocity_node = fgGetNode("/velocities/airspeed-kt", true);
     _total_pressure_node = node->getChild("total-pressure-inhg", 0, true);
-
-    _serviceable_node->setBoolValue(true);
 }
 
 void
diff --git a/src/Systems/static.cxx b/src/Systems/static.cxx
index 59111d322..f6cfa47b4 100644
--- a/src/Systems/static.cxx
+++ b/src/Systems/static.cxx
@@ -51,8 +51,6 @@ StaticSystem::init ()
     _serviceable_node = node->getChild("serviceable", 0, true);
     _pressure_in_node = fgGetNode("/environment/pressure-inhg", true);
     _pressure_out_node = node->getChild("pressure-inhg", 0, true);
-
-    _serviceable_node->setBoolValue(true);
 }
 
 void
diff --git a/src/Systems/vacuum.cxx b/src/Systems/vacuum.cxx
index fcf80d5c3..256e6efaf 100644
--- a/src/Systems/vacuum.cxx
+++ b/src/Systems/vacuum.cxx
@@ -60,8 +60,6 @@ VacuumSystem::init()
     _rpm_node = fgGetNode(rpm.c_str(), true);
     _pressure_node = fgGetNode("/environment/pressure-inhg", true);
     _suction_node = node->getChild("suction-inhg", 0, true);
-
-    _serviceable_node->setBoolValue(true);
 }
 
 void