Removing unnecessary validations