- Clean up over agreesive validation

- Registrants Report Scolling