diff --git a/docs/site/Controller-generator.md b/docs/site/Controller-generator.md
index 77afd82ffc80..689e2f1704bd 100644
--- a/docs/site/Controller-generator.md
+++ b/docs/site/Controller-generator.md
@@ -37,8 +37,8 @@ the name.
 
 The tool will prompt you for:
 
-- **Name of the controller.** If the name had been supplied from the command line,
-  the prompt is skipped and the controller is built with the name from the
+- **Name of the controller.** If the name had been supplied from the command
+  line, the prompt is skipped and the controller is built with the name from the
   command-line argument.
 - **Type of the controller.** You can select from the following types:
   - **Empty Controller** - An empty controller definition
diff --git a/docs/site/Glossary.md b/docs/site/Glossary.md
index 6585b6f0f01c..60069e394b44 100644
--- a/docs/site/Glossary.md
+++ b/docs/site/Glossary.md
@@ -23,7 +23,8 @@ values for writing web applications and APIs. For more information, see
 **Controller**: The implementation of API endpoints.
 
 **DataSource**: A named configuration for a Connector instance that represents
-data in an external system. For more information, see [DataSource](DataSource.md).
+data in an external system. For more information, see
+[DataSource](DataSource.md).
 
 **Element:** The building blocks of a Sequence, such as route, params, and
 result. For more information, see [Sequence](Sequence.md#elements).
diff --git a/examples/todo/test/acceptance/application.acceptance.ts b/examples/todo/test/acceptance/application.acceptance.ts
index eaebba203d4c..0757b020250f 100644
--- a/examples/todo/test/acceptance/application.acceptance.ts
+++ b/examples/todo/test/acceptance/application.acceptance.ts
@@ -9,7 +9,6 @@ import {TodoListApplication} from '../../src/application';
 import {TodoRepository} from '../../src/repositories/';
 import {givenTodo} from '../helpers';
 import {Todo} from '../../src/models/';
-import {BindingScope} from '@loopback/context';
 
 describe('Application', () => {
   let app: TodoListApplication;
diff --git a/packages/boot/src/booters/datasource.booter.ts b/packages/boot/src/booters/datasource.booter.ts
index 646d7cf53ad3..556f64ca2c4d 100644
--- a/packages/boot/src/booters/datasource.booter.ts
+++ b/packages/boot/src/booters/datasource.booter.ts
@@ -6,7 +6,6 @@
 import {CoreBindings} from '@loopback/core';
 import {AppWithRepository, juggler, Class} from '@loopback/repository';
 import {inject} from '@loopback/context';
-import {kebabCase} from 'lodash';
 import {ArtifactOptions} from '../interfaces';
 import {BaseArtifactBooter} from './base-artifact.booter';
 import {BootBindings} from '../keys';
diff --git a/packages/boot/test/fixtures/datasource.artifact.ts b/packages/boot/test/fixtures/datasource.artifact.ts
index 35512acf5f20..d1052925d6bc 100644
--- a/packages/boot/test/fixtures/datasource.artifact.ts
+++ b/packages/boot/test/fixtures/datasource.artifact.ts
@@ -3,8 +3,7 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {inject} from '@loopback/core';
-import {juggler, DataSource} from '@loopback/repository';
+import {juggler} from '@loopback/repository';
 
 export class DbDataSource extends juggler.DataSource {
   static dataSourceName = 'db';
diff --git a/packages/repository/src/mixins/repository.mixin.ts b/packages/repository/src/mixins/repository.mixin.ts
index 2a0eea726c8b..070f62c347fa 100644
--- a/packages/repository/src/mixins/repository.mixin.ts
+++ b/packages/repository/src/mixins/repository.mixin.ts
@@ -8,7 +8,6 @@ import {Repository} from '../repositories/repository';
 import {juggler} from '../repositories/legacy-juggler-bridge';
 import {Application} from '@loopback/core';
 import {BindingScope} from '@loopback/context';
-import {DataSource} from '..';
 
 /**
  * A mixin class for Application that creates a .repository()
diff --git a/packages/repository/test/unit/mixins/repository.mixin.unit.ts b/packages/repository/test/unit/mixins/repository.mixin.unit.ts
index d3ed0fef73bf..124fd8f4841a 100644
--- a/packages/repository/test/unit/mixins/repository.mixin.unit.ts
+++ b/packages/repository/test/unit/mixins/repository.mixin.unit.ts
@@ -15,7 +15,6 @@ import {
   Command,
   NamedParameters,
   PositionalParameters,
-  Connector,
 } from '../../../';
 import {Application, Component} from '@loopback/core';