Changed how the form is validated and removed some old files