diff --git a/ui/package-lock.json b/ui/package-lock.json
index d9482ae53..cdf8875e6 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -10793,11 +10793,6 @@
         }
       }
     },
-    "rxjs-compat": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.5.1.tgz",
-      "integrity": "sha512-k0aaMAYFg+DCIUxo3yJcUamFRenWLR23e/VJCQvKOxwSd9DQlwcSn2ov+7b23rKaX4weKG7OrzEBWGqQPkQ07A=="
-    },
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
diff --git a/ui/package.json b/ui/package.json
index 7553630d1..0ef179f85 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -40,7 +40,6 @@
     "ngx-infinite-scroll": "^7.2.0",
     "ngx-schema-form": "2.3.5",
     "rxjs": "^6.5.3",
-    "rxjs-compat": "^6.5.1",
     "xml-formatter": "^1.0.1",
     "z-schema": "^3.22.0",
     "zone.js": "~0.9.1"
diff --git a/ui/src/app/core/effect/user.effect.spec.ts b/ui/src/app/core/effect/user.effect.spec.ts
index ac5827ae4..1c11e0635 100644
--- a/ui/src/app/core/effect/user.effect.spec.ts
+++ b/ui/src/app/core/effect/user.effect.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { ReplaySubject } from 'rxjs/ReplaySubject';
+import { ReplaySubject } from 'rxjs';
 
 import { UserEffects } from './user.effect';
 import { Subject, of, throwError } from 'rxjs';
diff --git a/ui/src/app/core/effect/version.effect.spec.ts b/ui/src/app/core/effect/version.effect.spec.ts
index df8c47f50..2713d1362 100644
--- a/ui/src/app/core/effect/version.effect.spec.ts
+++ b/ui/src/app/core/effect/version.effect.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { ReplaySubject } from 'rxjs/ReplaySubject';
+import { ReplaySubject } from 'rxjs';
 
 import { VersionEffects } from './version.effect';
 import {
diff --git a/ui/src/app/core/service/modal.service.ts b/ui/src/app/core/service/modal.service.ts
index cea6780ca..7bac61417 100644
--- a/ui/src/app/core/service/modal.service.ts
+++ b/ui/src/app/core/service/modal.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { NgbModal, NgbModalOptions } from '@ng-bootstrap/ng-bootstrap';
-import { fromPromise } from 'rxjs/observable/fromPromise';
+import { from } from 'rxjs';
 
 export const DEFAULT_MODAL_OPTIONS: NgbModalOptions = {
     size: 'lg'
@@ -21,6 +21,6 @@ export class ModalService {
         if (modal.hasOwnProperty('componentInstance')) {
             Object.keys(inputs).forEach(key => modal.componentInstance[key] = inputs[key]);
         }
-        return fromPromise(modal.result);
+        return from(modal.result);
     }
 } /* istanbul ignore next */
diff --git a/ui/src/app/i18n/effect/message.effect.spec.ts b/ui/src/app/i18n/effect/message.effect.spec.ts
index b9686df16..a0b628e6f 100644
--- a/ui/src/app/i18n/effect/message.effect.spec.ts
+++ b/ui/src/app/i18n/effect/message.effect.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { ReplaySubject } from 'rxjs/ReplaySubject';
+import { ReplaySubject } from 'rxjs';
 
 import { MessageEffects } from './message.effect';
 
diff --git a/ui/src/app/metadata/domain/component/preview-dialog.component.ts b/ui/src/app/metadata/domain/component/preview-dialog.component.ts
index 7ac38f85f..9d08d4ea7 100644
--- a/ui/src/app/metadata/domain/component/preview-dialog.component.ts
+++ b/ui/src/app/metadata/domain/component/preview-dialog.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import * as FileSaver from 'file-saver';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 import { MetadataEntity } from '../../domain/model';
 
 @Component({
diff --git a/ui/src/app/metadata/domain/component/unsaved-entity.dialog.ts b/ui/src/app/metadata/domain/component/unsaved-entity.dialog.ts
index 10180a2a8..0df8d8715 100644
--- a/ui/src/app/metadata/domain/component/unsaved-entity.dialog.ts
+++ b/ui/src/app/metadata/domain/component/unsaved-entity.dialog.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 
 @Component({
     selector: 'unsaved-entity',
diff --git a/ui/src/app/metadata/filter/effect/search.effect.ts b/ui/src/app/metadata/filter/effect/search.effect.ts
index 53db753e8..2225bd91a 100644
--- a/ui/src/app/metadata/filter/effect/search.effect.ts
+++ b/ui/src/app/metadata/filter/effect/search.effect.ts
@@ -18,7 +18,7 @@ import {
 
 import { SearchDialogComponent } from '../component/search-dialog.component';
 import { EntityIdService } from '../../domain/service/entity-id.service';
-import { fromPromise } from 'rxjs/internal-compatibility';
+import { from } from 'rxjs';
 import { SelectId } from '../action/filter.action';
 import * as fromProvider from '../../provider/reducer';
 
@@ -50,7 +50,7 @@ export class SearchIdEffects {
             const modal = this.modalService.open(SearchDialogComponent) as NgbModalRef;
             const res = modal.result;
             modal.componentInstance.term = q;
-            return fromPromise(res).pipe(
+            return from(res).pipe(
                 map(id => new SelectId(id)),
                 catchError(() => of(new CancelViewMore()))
             );
diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.ts b/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.ts
index 399e75602..a4df116f8 100644
--- a/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.ts
+++ b/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.ts
@@ -70,7 +70,6 @@ export class ResolverWizardStepComponent implements OnDestroy {
             this.model$
         ).pipe(
             map(([def, ids, resolver]) => {
-                console.log(resolver);
                 return def.getValidators(
                     ids
                 );
diff --git a/ui/src/test.ts b/ui/src/test.ts
index 03b44d82f..d762d1284 100644
--- a/ui/src/test.ts
+++ b/ui/src/test.ts
@@ -12,7 +12,7 @@ import {
     platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-import 'rxjs/Rx';
+import 'rxjs';
 
 // Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
 declare const __karma__: any;
diff --git a/ui/src/testing/activated-route.stub.ts b/ui/src/testing/activated-route.stub.ts
index 733b6df8e..7e222b6ce 100644
--- a/ui/src/testing/activated-route.stub.ts
+++ b/ui/src/testing/activated-route.stub.ts
@@ -1,8 +1,8 @@
 /* istanbul ignore */
 
 import { Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { convertToParamMap, ParamMap, ActivatedRoute } from '@angular/router';
+import { BehaviorSubject } from 'rxjs';
+import { convertToParamMap, ParamMap } from '@angular/router';
 import { Observable, of } from 'rxjs';
 
 @Injectable()
diff --git a/ui/src/testing/file.service.stub.ts b/ui/src/testing/file.service.stub.ts
index b3cc02fdf..4263836e5 100644
--- a/ui/src/testing/file.service.stub.ts
+++ b/ui/src/testing/file.service.stub.ts
@@ -1,4 +1,4 @@
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 import { Observable } from 'rxjs';
 
 export class FileServiceStub {
diff --git a/ui/src/testing/router.stub.ts b/ui/src/testing/router.stub.ts
index 3f93452a7..74fcdf718 100644
--- a/ui/src/testing/router.stub.ts
+++ b/ui/src/testing/router.stub.ts
@@ -1,5 +1,4 @@
 import { Component, Directive, Input, Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { NavigationExtras } from '@angular/router';
 
 /*tslint:disable*/