Remove unnecessary validations