Revert "Add/fix validations"

This reverts commit 29afbb0b2393ada58a34a0af369762b32a9b122a.