diff --git a/service/src/provision/index.js b/service/src/provision/index.js
index c83981e30..96e3057cb 100644
--- a/service/src/provision/index.js
+++ b/service/src/provision/index.js
@@ -1,5 +1,6 @@
 const { modulesPathsInDir } = require('../utilities/loader');
 const log = require('../logger');
+// TODO: users-next
 const AuthenticationConfiguration = require('../models/authenticationconfiguration');
 
 /**
diff --git a/service/src/routes/authenticationconfigurations.js b/service/src/routes/authenticationconfigurations.js
index cdf239035..1439cf27a 100644
--- a/service/src/routes/authenticationconfigurations.js
+++ b/service/src/routes/authenticationconfigurations.js
@@ -4,6 +4,7 @@ const log = require('winston')
   , AsyncLock = require('async-lock')
   , access = require('../access')
   , Authentication = require('../models/authentication')
+  // TODO: users-next
   , AuthenticationConfiguration = require('../models/authenticationconfiguration')
   , AuthenticationConfigurationTransformer = require('../transformers/authenticationconfiguration')
   , SecretStoreService = require('../security/secret-store-service')
diff --git a/service/src/routes/setup.js b/service/src/routes/setup.js
index ae2462f72..21c1182e0 100644
--- a/service/src/routes/setup.js
+++ b/service/src/routes/setup.js
@@ -4,6 +4,7 @@ module.exports = function (app, security) {
     , User = require('../models/user')
     , Device = require('../models/device')
     , userTransformer = require('../transformers/user')
+    // TODO: users-next
     , AuthenticationConfiguration = require('../models/authenticationconfiguration');
 
   function authorizeSetup(req, res, next) {
diff --git a/service/src/security/utilities/secure-property-appender.js b/service/src/security/utilities/secure-property-appender.js
index 3a05c1115..b4208c370 100644
--- a/service/src/security/utilities/secure-property-appender.js
+++ b/service/src/security/utilities/secure-property-appender.js
@@ -1,11 +1,12 @@
 'use strict';
 
 const SecretStoreService = require('../secret-store-service')
+// TODO: users-next
     , AuthenticationConfiguration = require('../../models/authenticationconfiguration')
 
 /**
  * Helper function to append secure properties to a configuration under the settings property.
- * 
+ *
  * @param {*} config Must contain the _id property
  * @returns A copy of the config with secure properties appended (if any exist)
  */
diff --git a/service/src/transformers/authenticationconfiguration.js b/service/src/transformers/authenticationconfiguration.js
index ed596dfd6..cc068c954 100644
--- a/service/src/transformers/authenticationconfiguration.js
+++ b/service/src/transformers/authenticationconfiguration.js
@@ -1,5 +1,6 @@
 "use strict";
 
+// TODO: users-next
 const AuthenticationConfiguration = require('../models/authenticationconfiguration');
 
 function transformAuthenticationConfiguration(authenticationConfiguration, options) {
diff --git a/service/src/utilities/authenticationApiAppender.js b/service/src/utilities/authenticationApiAppender.js
index 715af906f..b437ce7e7 100644
--- a/service/src/utilities/authenticationApiAppender.js
+++ b/service/src/utilities/authenticationApiAppender.js
@@ -1,15 +1,16 @@
 "use strict";
 
 const extend = require('util')._extend
+    // TODO: users-next
     , AuthenticationConfiguration = require('../models/authenticationconfiguration')
     , AuthenticationConfigurationTransformer = require('../transformers/authenticationconfiguration');
 
 /**
- * Appends authenticationStrategies to the config.api object (the original config.api is not modified; this method returns a copy).  
+ * Appends authenticationStrategies to the config.api object (the original config.api is not modified; this method returns a copy).
  * These strategies are read from the db.
- * 
- * @param {*} api 
- * @param {*} options 
+ *
+ * @param {*} api
+ * @param {*} options
  * @returns Promise containing the modified copy of the api parameter
  */
 async function append(api, options) {