CHERKASY-102 fixes following the PR: removing unnecessary uses of core.db specific classes