Remove needless optimization