diff --git a/CHANGELOG.md b/CHANGELOG.md
index e70ed69e..adca1248 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -185,6 +185,7 @@ Because it is the minimum version available for Vitest.
 * [#226] - Ensure that scripts in the "Get the diff from the latest commit where the GitHub Actions succeeded" step finish successfully even if the `context.payload.pull_request` is undefined
 * [#227] - Migrate from CommonJS to ESM
 * [#228] - Reduce package size
+* [#235] - Remove unused directive comments for ESLint
 
 [#182]: https://github.com/sounisi5011/package-version-git-tag/pull/182
 [#183]: https://github.com/sounisi5011/package-version-git-tag/pull/183
@@ -223,6 +224,7 @@ Because it is the minimum version available for Vitest.
 [#230]: https://github.com/sounisi5011/package-version-git-tag/pull/230
 [#233]: https://github.com/sounisi5011/package-version-git-tag/pull/233
 [#234]: https://github.com/sounisi5011/package-version-git-tag/pull/234
+[#235]: https://github.com/sounisi5011/package-version-git-tag/pull/235
 
 ## [3.0.0] (2020-06-02 UTC)
 
diff --git a/Taskfile.yml b/Taskfile.yml
index 85b42b3e..869d0c34 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -51,13 +51,17 @@ tasks:
   _fmt-xs:
     internal: true
     cmds:
+      # Note: The "--report-unused-disable-directives" option was intentionally omitted for this command.
+      #       The "--report-unused-disable-directives" option and the "--fix" option together will automatically remove old directive comments.
+      #       However, the line from which the comment was removed remains intact, and Prettier may not remove this line.
+      #       For this reason, we remove old directive comments manually.
       - eslint {{- if .ESLINT_EXT }} --ext '{{ .ESLINT_EXT }}' {{- end }} --fix ./
 
   lint:
     deps: [eslint, tsc-src, tsc-test]
   eslint:
     cmds:
-      - eslint ./
+      - eslint --report-unused-disable-directives ./
   tsc-src:
     cmds:
       - tsc --noEmit
diff --git a/test/helpers/git-server.ts b/test/helpers/git-server.ts
index 2f484d95..e111328b 100644
--- a/test/helpers/git-server.ts
+++ b/test/helpers/git-server.ts
@@ -39,7 +39,6 @@ export default async function (
              * Note: The try...catch statement does not catch the error for the http/https module.
              * @see https://github.com/expressjs/express/issues/2856#issuecomment-172566787
              */
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
             repos.server?.on('error', reject);
         })
             .then(() => {
diff --git a/test/helpers/git.ts b/test/helpers/git.ts
index 5c1c7c48..a4717a39 100644
--- a/test/helpers/git.ts
+++ b/test/helpers/git.ts
@@ -18,7 +18,6 @@ interface InitGitOptions {
     execDefaultEnv?: NodeJS.ProcessEnv | undefined;
 }
 
-/* eslint-disable import/export */
 export async function initGit(
     dirpath: string,
     options: InitGitOptions & {