Implemented entity keyvalues using datamaps.  Removed old keyvalues implementation.