Cleanup run and run_all params