Remove dead code in testsuite