Major code cleanup

This is a major code cleanup.

I have eliminated most uses of concurrent collections that are unnecessary, and removed some unnecessary data cache collections.