removed complex validations

changes