remove unused references
cleanup up test runner