Revert "Added validations"

This reverts commit f685341af9b99611aac6a2e6a8e1f8308b7f9aed.