transition to new runner
cleanup code from old runner