Remove needless logic