remove refs to IdentityMap since it no longer exists
counter cache tests pass without CPK modifications