Removed redundant checks on validation