Seperate the runner admin stuff and delete redundent code.