Tiny refactor of excess cleanup.
Tiny refinement of excess cleanup.