Started refactoring validations.
Revert "Started refactoring validations."

This reverts commit 6871f9f7f75e7035d34d5a55718359e5084a30c0.