#2782 - Removing ConcurrentIdentityHashMap and shake this all about

net negative baby