diff --git a/.editorconfig b/.editorconfig
index 7f9f1c9bf..f49b2a3e4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,9 +7,6 @@ charset = utf-8
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-# Traditionally, the end-of-line character has been platform-specific.
-end_of_line = unset
-
 [*.txt]
 indent_style = space
 
@@ -40,12 +37,6 @@ max_doc_length = unset
 max_line_length = unset
 trim_trailing_whitespace = unset
 
-[*~]
-end_of_line = unset
-indent_style = unset
-insert_final_newline = unset
-trim_trailing_whitespace = unset
-
 [COMMIT_EDITMSG]
 indent_style = space
 max_doc_length = unset
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fca2bb83f..a7a9d3373 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,6 @@ option(PNG_BUILD_ZLIB "Custom zlib location, else find_package is used" OFF)
 if(NOT PNG_BUILD_ZLIB)
   find_package(ZLIB REQUIRED)
 elseif(POLICY CMP0074)
-  # TODO: Remove the policy check if CMake version 3.12 or greater becomes the minimum required.
   if("x${ZLIB_ROOT}" STREQUAL "x")
     message(DEPRECATION
             "The option PNG_BUILD_ZLIB has been deprecated; please use ZLIB_ROOT instead")
diff --git a/configure b/configure
index 263bb0e61..f83ca644d 100755
--- a/configure
+++ b/configure
@@ -14721,7 +14721,6 @@ printf "%s\n" "#define PNG_LOONGARCH_LSX_OPT 1" >>confdefs.h
 fi
 
 
-# FIXME: This section should not be needed.
 if test "$enable_loongarch_lsx" != "no" &&
    case "$host_cpu" in
       loongarch*) : ;;
diff --git a/configure.ac b/configure.ac
index 21f0b14fe..eed51a8d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -621,7 +621,6 @@ AC_ARG_ENABLE([loongarch-lsx],
                       [invalid argument])
    esac])
 
-# FIXME: This section should not be needed.
 if test "$enable_loongarch_lsx" != "no" &&
    case "$host_cpu" in
       loongarch*) : ;;