Removed some validations (rework required)
6 files changed