Revert "Initial validation. Revert back after presentation."

This reverts commit 6d5d0c66fc73b6e117a51488b15d9123e71f5e00.