diff --git a/common/font/outline_font.cpp b/common/font/outline_font.cpp
index 263aa0686b..abbf5067dd 100644
--- a/common/font/outline_font.cpp
+++ b/common/font/outline_font.cpp
@@ -86,8 +86,6 @@ FT_Error OUTLINE_FONT::loadFace( const wxString& aFontFileName, int aFaceIndex )
 {
     std::lock_guard<std::mutex> guard( m_freeTypeMutex );
 
-    // TODO: check that going from wxString to char* with UTF-8
-    // conversion for filename makes sense on any/all platforms
     FT_Error e = FT_New_Face( m_freeType, aFontFileName.mb_str( wxConvUTF8 ), aFaceIndex, &m_face );
 
     if( !e )
diff --git a/eeschema/sch_io/altium/sch_io_altium.cpp b/eeschema/sch_io/altium/sch_io_altium.cpp
index 4b66037779..6e8a274f46 100644
--- a/eeschema/sch_io/altium/sch_io_altium.cpp
+++ b/eeschema/sch_io/altium/sch_io_altium.cpp
@@ -1451,8 +1451,6 @@ void SCH_IO_ALTIUM::AddTextBox( const ASCH_TEXT_FRAME *aElem )
         break;
     }
 
-    // JEY TODO: word-wrap once KiCad supports wrapped text.
-
     size_t fontId = static_cast<int>( aElem->FontID );
 
     if( m_altiumSheet && fontId > 0 && fontId <= m_altiumSheet->fonts.size() )
diff --git a/libs/core/utf8.cpp b/libs/core/utf8.cpp
index d3b09356b3..4bae2376ef 100644
--- a/libs/core/utf8.cpp
+++ b/libs/core/utf8.cpp
@@ -230,7 +230,6 @@ UTF8& UTF8::operator+=( unsigned w_ch )
     }
     else
     {
-        //TODO: Remove wchar use.  Replace with std::byte*
         wchar_t wide_chr[2];    // buffer to store wide chars (UTF16) read from aText
         wide_chr[1] = 0;
         wide_chr[0] = w_ch;
diff --git a/pcbnew/array_creator.cpp b/pcbnew/array_creator.cpp
index 0f0cb53326..b04b31ba35 100644
--- a/pcbnew/array_creator.cpp
+++ b/pcbnew/array_creator.cpp
@@ -163,9 +163,6 @@ void ARRAY_CREATOR::Invoke()
                         // Silently drop other items (such as footprint texts) from duplication
                         break;
                     }
-
-                    // @TODO: we should merge zones. This is a bit tricky, because
-                    // the undo command needs saving old area, if it is merged.
                 }
 
                 // Add new items to selection (footprints in the selection will be reannotated)
diff --git a/pcbnew/drc/drc_test_provider_edge_clearance.cpp b/pcbnew/drc/drc_test_provider_edge_clearance.cpp
index 230008bf52..541403fd7a 100644
--- a/pcbnew/drc/drc_test_provider_edge_clearance.cpp
+++ b/pcbnew/drc/drc_test_provider_edge_clearance.cpp
@@ -38,12 +38,6 @@
     Errors generated:
     - DRCE_EDGE_CLEARANCE
     - DRCE_SILK_EDGE_CLEARANCE
-
-    TODO:
-    - separate holes to edge check
-    - tester only looks for edge crossings. it doesn't check if items are inside/outside the board
-      area.
-    - pad test missing!
 */
 
 class DRC_TEST_PROVIDER_EDGE_CLEARANCE : public DRC_TEST_PROVIDER_CLEARANCE_BASE
diff --git a/pcbnew/drc/drc_test_provider_text_dims.cpp b/pcbnew/drc/drc_test_provider_text_dims.cpp
index ddea361a07..7e56ff9a14 100644
--- a/pcbnew/drc/drc_test_provider_text_dims.cpp
+++ b/pcbnew/drc/drc_test_provider_text_dims.cpp
@@ -159,9 +159,8 @@ bool DRC_TEST_PROVIDER_TEXT_DIMS::Run()
 
                     for( const std::unique_ptr<KIFONT::GLYPH>& glyph : *glyphs )
                     {
-                        // Ensure the glyph is a OUTLINE_GLYPH
-                        // for texts with overbar, it can be a STROKE_GLYPH
-                        // TODO: perhaps test the overbar thickness.
+                        // Ensure the glyph is a OUTLINE_GLYPH (for instance, overbars in outline
+                        // font text are represented as STROKE_GLYPHs).
                         if( !glyph->IsOutline() )
                             continue;
 
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 9668b48138..4606095ec2 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -1470,7 +1470,6 @@ void PCB_EDIT_FRAME::SetActiveLayer( PCB_LAYER_ID aLayer )
 
 void PCB_EDIT_FRAME::onBoardLoaded()
 {
-    // JEY TODO: move this global to the board
     ENUM_MAP<PCB_LAYER_ID>& layerEnum = ENUM_MAP<PCB_LAYER_ID>::Instance();
 
     layerEnum.Choices().Clear();