diff --git a/lib/core/form/form-base.module.ts b/lib/core/form/form-base.module.ts
index ca78648058..81357c2f27 100644
--- a/lib/core/form/form-base.module.ts
+++ b/lib/core/form/form-base.module.ts
@@ -41,7 +41,6 @@ import { A11yModule } from '@angular/cdk/a11y';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { ViewerModule } from '../viewer/viewer.module';
 import { TabsWidgetComponent } from './components/widgets/tabs/tabs.widget';
-import { ContainerWidgetComponent } from './components/widgets/container/container.widget';
 
 @NgModule({
     imports: [
diff --git a/package.json b/package.json
index d3000f6365..9e1fce3156 100644
--- a/package.json
+++ b/package.json
@@ -20,10 +20,10 @@
     "review-checker": "node ./tools/doc/reviewChecker.js",
     "01": "echo -------------------------------------------- Build Lib  -----------------------------------------------",
     "01s": "",
-    "unit-test": "concurrently \"ng test content-services --watch=false\" \"ng test process-services --watch=false\" \"ng test core --watch=false\" \"ng test extensions --watch=false\" \"ng test insights --watch=false\" \"ng test process-services-cloud --watch=false\" ",
+    "unit-test": "concurrently \"nx test content-services --watch=false\" \"nx test process-services --watch=false\" \"nx test core --watch=false\" \"nx test extensions --watch=false\" \"nx test insights --watch=false\" \"nx test process-services-cloud --watch=false\" ",
     "build-lib": "./scripts/build/build-all-lib.sh",
     "affected:libs": "nx affected:libs",
-    "inspect.bundle": "ng build demoshell --configuration production --stats-json && npx webpack-bundle-analyzer dist/demo-shell/stats.json",
+    "inspect.bundle": "nx build demoshell --configuration production --stats-json && npx webpack-bundle-analyzer dist/demo-shell/stats.json",
     "coverage": "./lib/config/create-coverage-index.sh && lite-server -c ./lib/config/proxy-coverage.json",
     "03": "echo -------------------------------------------- Lint  -----------------------------------------------",
     "03s": "",
@@ -35,15 +35,15 @@
     "stylelint": "stylelint ./**/*.scss --config stylelint-config.json",
     "04": "echo -------------------------------------------- Demo Shell -----------------------------------------------",
     "04s": "",
-    "start": "ng serve demoshell --open",
-    "start:prod": "ng serve demoshell --configuration production --open",
-    "build": "ng build demoshell",
-    "build:prod": "node --max-old-space-size=12000 node_modules/@angular/cli/bin/ng build demoshell --configuration production",
-    "test": "ng test demoshell --watch=false",
+    "start": "nx serve demoshell --open",
+    "start:prod": "nx serve demoshell --configuration production --open",
+    "build": "nx build demoshell",
+    "build:prod": "node --max-old-space-size=12000 node_modules/@angular/cli/bin/nx build demoshell --configuration production",
+    "test": "nx test demoshell --watch=false",
     "05": "echo -------------------------------------------- E2e -----------------------------------------------",
     "05s": "",
     "e2e": "./scripts/test-e2e-lib.sh -host 'localhost:4200' -dev --folder demo-shell",
-    "e2e-lib": "ng e2e lib-e2e-test --port=4200",
+    "e2e-lib": "nx e2e lib-e2e-test --port=4200",
     "lite-server-e2e": "lite-server --baseDir='dist/demo-shell/' -c ./e2e/lite-server-proxy.js",
     "postbuild:ci": "node ./scripts/app-config-replace.js",
     "06": "echo -------------------------------------------- Clean ----------------------------------------------",