Prune cruft from test_dispatcher