Runner cleanup

I still need to review this branch before merge...