We're writing new guidelines about this and I hate to disappoint but we can't accept "cleanup" / refactor PRs. We work across at least 4 different branches at the same time and merging will become absolutely impossible if one of the branches has had many things refactored like this.