removed unusued session clause
untested: descriptor consolidation db c++ side updates