Removed extra validations