I agree that this needs urgent cleanout. I'll try and look over the PRs
soon...