multidb support cleanup