I definitely agree a PR should remain focused... at the same time, I worry that if not now, then *when* does code like this get cleaned up :). It has clearly survived several other changes in the area.

I would propose that cleanups such as this (i.e., removal of dead code) can happen as part of a relevant PR, when it's clear the reviewer already needs to understand the logic surrounding the change. As long as it's a separate commit in the PR, it's trivial for the reviewer to verify that one change in isolation.

Still, my opinions on code cleanups would not stop this patch from landing, so don't feel pressured to address this here :)