Refactoring...

Remove some debugging code and TODO notes
Remove extraneous code from runner.