Reformat WatsonSim; remove old comment