more cleaning of simulation scripts