Remove duplication of command running
Remove unrequired arguments from runtimes