drop validations which should be redundant due to code path
5 files changed