#516- Fixed some bugs that centered around removing validations.