[#8376] remove some unnecessary validations
2 files changed