Remove auto-inclusion of IdentityMap