Cleanups and note in runner