Added disabling of automatic storing and cleaning up of runs