Merge "Remove dead code for tests that have not run since 2018."