Removed obsolete ProxyEntryMap