I'm guessing this is just "additional cleanup"? Doesn't seem related to this PR. Fine for me to keep it here, just curious where it comes from... ;-)