cleaned up qdb tdb integration