pre-code-review cleanup