Changed validation calls to new, singular validate method
Removed now unused code