refactoring; do better cleanup
refactoring; do better cleanup

cyber-dojo/runner,cyber-dojo/runner_stateless,cyber-dojo/runner_stateless,cyber-dojo/runner_stateless,cyber-dojo/runner_stateless,cyber-dojo/runner,cyber-dojo/runner_stateless,cyber-dojo/runner_stateless,cyber-dojo/runner_stateless