New C++ data model.
deleted some stuff.