Merge "Get rid of unnecessary noManSimulation function."