Removed entity-specific lookups.