Performance enhancements to Data Object, plus removed some unneeded, deprecated classes