comment-cleanup

A set of rules for keeping code comments short, useful, and durable. It removes redundant or outdated comments while preserving explanations of non-obvious logic, business rules, and required directives.

In plain words
What is it for?
Use it when adding, editing, reviewing, or removing comments, after code changes, before committing, or when cleaning comments across a specified repository scope.
Why use it?
It reduces comment clutter without changing how the code works. By default, it limits cleanup to comments changed in the current diff, avoiding unrelated edits.

Skill for Claude CodeCodex

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/motlin/claude-code-plugins/comment-cleanup
Any agent
npx skills add motlin/claude-code-plugins --skill comment-cleanup
Clone the repo
git clone --depth 1 https://github.com/motlin/claude-code-plugins

Made for: Claude Code, Codex.

Per session 53 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 380 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00053 $0.00380
Opus 5 $0.00026 $0.00190
Sonnet 5 $0.00011 $0.00076
Haiku 4.5 $0.00005 $0.00038

Measured 2d ago against content hash 6a5a467f029d, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

comment-cleanup scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 2d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

plugins/code/skills/comment-cleanup/SKILL.md · 36 lines

What it actually says

Comment Guidelines

Use comments sparingly. Preserve comments that explain non-obvious logic, constraints, or business rules.

Choose cleanup scope

Default to diff-only cleanup. Inspect the complete staged and unstaged patch and edit only comments introduced or changed by that patch. Looking at every changed file is too broad because unchanged comments in those files are outside scope.

Use repository-wide cleanup only when the user explicitly asks to clean all comments, the whole repository, or a named directory. In repository-wide mode, apply the same rules to existing comments inside the requested scope.

Remove comment clutter

  • Delete commented-out code.
  • Delete comments that merely restate the code or method name.
  • Delete edit-history narration using terms such as "added", "removed", "changed", "updated", or "now handles".
  • Remove redundant comments without hesitation when the code is already self-explanatory.

Preserve necessary comments

  • Preserve TODO, FIXME, and similar work markers.
  • Preserve linter, formatter, compiler, coverage, and generated-code directives.
  • Preserve non-obvious reasoning and business rules.
  • Preserve pre-existing comments during diff-only cleanup.
  • Do not remove a comment when doing so would leave an invalid or empty required scope.

Place comments cleanly

Do not use end-of-line comments. Move a necessary end-of-line comment to its own line immediately above the code it describes, using the same indentation.

Focus only on comments. Do not change executable code, behavior, formatting unrelated to the moved or removed comment, or generated files that should be regenerated instead.

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 2d ago First seen · 36 lines · 53 tokens per session scan A 6a5a467f029d

Subscribe to this mod's changes

comment-cleanup is a skill published in the GitHub repository motlin/claude-code-plugins (15 stars, last pushed 3d ago), licensed Apache-2.0. It adds 53 tokens to every session and 380 once invoked, about $0.0003 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.

Related

Other skills, from other repositories

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.

obra/superpowers · 21 tokens

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.

obra/superpowers · 37 tokens

chat-pet-sprite-creation

Use when creating or changing VS Code chat pet sprite art, sprite sheets, state animations, eye treatments, Stable/Insiders variants, or pet transitions under src/vs/workbench/contrib/chat/browser/widget/media/chatPet.

microsoft/vscode · 53 tokens

cpu-profile-analysis

Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…

microsoft/vscode · 71 tokens

agent-host-chat-contributions

Build and review cross-cutting agent-host chat behavior through lifecycle contributions. Use when adding turn lifecycle side effects, prompt or context injection, restored-history transformation, protocol-action observation, or when reviewing changes that add code to AgentSideEffects or AgentService.

microsoft/vscode · 56 tokens

auto-perf-optimize

Run agent-driven VS Code performance or memory investigations. Use when asked to launch Code OSS, automate a VS Code scenario, run the Chat memory smoke runner, capture renderer heap snapshots, take workflow screenshots, compare run summaries, or drive a repeatable scenario before heap-snapshot analysis.

microsoft/vscode · 62 tokens