EMPIREDB-282: removed unnecessary validation checks
3 files changed