Triage/testsuite cleanup