removed other manual validations