How is this change related to the rest of the PR? Or is this just cleanup?