Added two more validation scripts. Further simplifications.