removed unused code
prepare for multidb support