diff --git a/eeschema/sch_group.cpp b/eeschema/sch_group.cpp
index 46faf03599..39fd2b7701 100644
--- a/eeschema/sch_group.cpp
+++ b/eeschema/sch_group.cpp
@@ -333,7 +333,6 @@ void SCH_GROUP::MirrorVertically( int aCenter )
 void SCH_GROUP::Plot( PLOTTER* aPlotter, bool aBackground, const SCH_PLOT_OPTS& aPlotOpts,
                       int aUnit, int aBodyStyle, const VECTOR2I& aOffset, bool aDimmed )
 {
-    // TODO: should we plot the name & border of named groups?
 }
 
 
diff --git a/eeschema/sch_marker.cpp b/eeschema/sch_marker.cpp
index af8588ff70..d8b08f927e 100644
--- a/eeschema/sch_marker.cpp
+++ b/eeschema/sch_marker.cpp
@@ -77,13 +77,11 @@ void SCH_MARKER::swapData( SCH_ITEM* aItem )
 
     std::swap( m_markerType, item->m_markerType );
     std::swap( m_excluded, item->m_excluded );
+    std::swap( m_comment, item->m_comment );
     std::swap( m_rcItem, item->m_rcItem );
 
     std::swap( m_scalingFactor, item->m_scalingFactor );
     std::swap( m_shapeBoundingBox, item->m_shapeBoundingBox );
-
-    // TODO: isn't this going to swap all the stuff above a second time?
-    std::swap( *((SCH_MARKER*) this), *((SCH_MARKER*) aItem ) );
 }
 
 
diff --git a/qa/tests/spice/test_library_spice.cpp b/qa/tests/spice/test_library_spice.cpp
index af913ad4b9..5b8981876c 100644
--- a/qa/tests/spice/test_library_spice.cpp
+++ b/qa/tests/spice/test_library_spice.cpp
@@ -1142,8 +1142,6 @@ BOOST_AUTO_TEST_CASE( Fets )
 
         BOOST_TEST_CONTEXT( "FET index: " << i )
 
-        // TODO: Actually test ALL model parameters.
-
         switch( i )
         {
         case 0: