Cleanup and pull out Runner objects to dispatch  on.