It started with an attempt to fix a flaky unit test, which expanded into deleting some unused code which expanded into deleting almost 4000 lines of code. A nice PR to finish off with before vacation starts!