clean-up WIP; teiid/generic sql stuff merged into sql cube; config merged into core_api; use iterkeys in loops; misc
misc cleanup