Removed redundant checks in Base Pickers.