=further cleanup in runner.c