Removed redundent verify/get code