diff --git a/src/GUI/AirportDiagram.cxx b/src/GUI/AirportDiagram.cxx
index 2be06d28a..51a67d8c4 100644
--- a/src/GUI/AirportDiagram.cxx
+++ b/src/GUI/AirportDiagram.cxx
@@ -591,11 +591,6 @@ void AirportDiagram::mouseReleaseEvent(QMouseEvent* me)
             return;
         }
     }
-
-
-#if 0
-    img.save("/Users/jmt/Desktop/img.png");
-#endif
 }
 
 QPainterPath AirportDiagram::pathForRunway(const RunwayData& r, const QTransform& t,
diff --git a/src/Navaids/route.cxx b/src/Navaids/route.cxx
index d0a2e873d..eb4af3dd9 100644
--- a/src/Navaids/route.cxx
+++ b/src/Navaids/route.cxx
@@ -712,7 +712,7 @@ RouteBase::~RouteBase()
     
 void RouteBase::dumpRouteToKML(const WayptVec& aRoute, const std::string& aName)
 {
-  SGPath p = "/Users/jmt/Desktop/" + aName + ".kml";
+  SGPath p = SGPath::desktop() / (aName + ".kml");
   sg_ofstream f(p);
   if (!f.is_open()) {
     SG_LOG(SG_NAVAID, SG_WARN, "unable to open:" << p);
diff --git a/test_suite/system_tests/Instrumentation/testgps.cxx b/test_suite/system_tests/Instrumentation/testgps.cxx
index ab0a7aa9d..97d89cccf 100644
--- a/test_suite/system_tests/Instrumentation/testgps.cxx
+++ b/test_suite/system_tests/Instrumentation/testgps.cxx
@@ -281,7 +281,7 @@ void GPSTests::testGPS()
   WayptRef awy6 = new NavaidWaypoint(
     (FGPositioned*) fgFindAirportID("KJFK"), NULL);
 
-  SGPath p("/Users/jmt/Desktop/airways.kml");
+  SGPath p SGPath::desktop() / "airways.kml";
   sg_ofstream f;
   f.open(p, fstream::out | fstream::trunc);
 
@@ -312,7 +312,7 @@ void GPSTests::testGPS()
   f.close();
 
 // procedures
-  SGPath op("/Users/jmt/Desktop/procedures.kml");
+  SGPath op SGPath::desktop() / "procedures.kml";
   f.open(op, fstream::out | fstream::trunc);
 
   FGAirport* eham = (FGAirport*) fgFindAirportID("EHAM");