I think we should keep cleanups like this out of this PR, it will just make whats actually changing harder to review.