diff --git a/db-service/lib/SQLService.js b/db-service/lib/SQLService.js
index 837cfb929..09e999cd3 100644
--- a/db-service/lib/SQLService.js
+++ b/db-service/lib/SQLService.js
@@ -2,6 +2,7 @@ const cds = require('@sap/cds'),
   DEBUG = cds.debug('sql|db')
 const { Readable, Transform } = require('stream')
 const { pipeline } = require('stream/promises')
+// TODO
 const { resolveView, getDBTable, getTransition } = require('@sap/cds/libx/_runtime/common/utils/resolveView')
 const DatabaseService = require('./common/DatabaseService')
 const cqn4sql = require('./cqn4sql')
diff --git a/db-service/lib/deep-queries.js b/db-service/lib/deep-queries.js
index 707147545..60ae18169 100644
--- a/db-service/lib/deep-queries.js
+++ b/db-service/lib/deep-queries.js
@@ -3,6 +3,7 @@ const { _target_name4 } = require('./SQLService')
 
 const ROOT = Symbol('root')
 
+// TODO
 const compareJson = require('@sap/cds/libx/_runtime/common/utils/compareJson').compareJson
 
 const handledDeep = Symbol('handledDeep')
diff --git a/db-service/lib/fill-in-keys.js b/db-service/lib/fill-in-keys.js
index 98c90e23b..63e6d9c23 100644
--- a/db-service/lib/fill-in-keys.js
+++ b/db-service/lib/fill-in-keys.js
@@ -1,6 +1,7 @@
 const cds = require('@sap/cds')
 const { hasDeep } = require('./deep-queries')
 
+// TODO
 // REVISIT: very deep & fragile dependencies to internal modules -> copy these into here
 const propagateForeignKeys = require('@sap/cds/libx/_runtime/common/utils/propagateForeignKeys')
 const { enrichDataWithKeysFromWhere } = require('@sap/cds/libx/_runtime/common/utils/keys')
diff --git a/db-service/test/cqn4sql/with-parameters.test.js b/db-service/test/cqn4sql/with-parameters.test.js
index 2dbcbf9db..6f59e7779 100644
--- a/db-service/test/cqn4sql/with-parameters.test.js
+++ b/db-service/test/cqn4sql/with-parameters.test.js
@@ -4,9 +4,9 @@
  */
 'use strict'
 
-const { SELECT } = require('@sap/cds/lib/ql/cds-ql')
-const cqn4sql = require('../../lib/cqn4sql')
 const cds = require('@sap/cds')
+const { SELECT } = cds.ql
+const cqn4sql = require('../../lib/cqn4sql')
 const { expect } = cds.test
 describe('entities and views with parameters', () => {
   let model
diff --git a/test/sflight/test/odata.test.js b/test/sflight/test/odata.test.js
index f1c7562cc..22220d16a 100644
--- a/test/sflight/test/odata.test.js
+++ b/test/sflight/test/odata.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 const { GET, POST, PATCH, axios, expect } = cds.test(__dirname+'/..')
 const EDIT = (url) => POST (url+'/TravelService.draftEdit',{})
 const SAVE = (url) => POST (url+'/TravelService.draftActivate')