remove pointless verifications