diff --git a/build/tslint.json b/build/tslint.json
index f8f80120b..c457ffe31 100644
--- a/build/tslint.json
+++ b/build/tslint.json
@@ -3,7 +3,7 @@
         "arrow-return-shorthand": true,
         "class-name": true,
         "curly": true,
-        "deprecation": false,
+        "deprecation": true,
         "forin": false,
         "indent": [true, "spaces", 4],
         "jsdoc-format": false,
diff --git a/e2e/modal-navigation/app/home/home-page.ts b/e2e/modal-navigation/app/home/home-page.ts
index 1ce7f9179..2746f8df1 100644
--- a/e2e/modal-navigation/app/home/home-page.ts
+++ b/e2e/modal-navigation/app/home/home-page.ts
@@ -1,5 +1,4 @@
 import * as application from "tns-core-modules/application";
-import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import { NavigatedData, Page } from "tns-core-modules/ui/page";
 import { View, EventData, ShowModalOptions } from "tns-core-modules/ui/core/view";
 import { Frame } from "tns-core-modules/ui/frame";
@@ -23,10 +22,17 @@ export function onNavigatedFrom(args: NavigatedData) {
 export function onModalNoPage(args: EventData) {
     const view = args.object as View;
 
-    view.showModal("modal-no-page/modal-no-page",
-        "context",
-        () => console.log("home-page modal frame closed"),
-        false);
+    view.showModal("modal-no-page/modal-no-page", {
+        context: "context",
+        closeCallback: () => console.log("home-page modal frame closed"),
+        fullscreen: false
+    });
+
+    view.showModal("modal-no-page/modal-no-page", { 
+        context: "context",
+        closeCallback: () => console.log("home-page modal frame closed"),
+        fullscreen: false
+    });
 }
 
 export function onPopoverModal(args: EventData) {
@@ -49,49 +55,51 @@ export function onModalFrame(args: EventData) {
     const frame = new Frame();
     frame.navigate("modal/modal-page");
 
-    view.showModal(frame,
-        "context",
-        () => console.log("home-page modal frame closed"),
-        false);
+    view.showModal(frame, {
+        context: "context",
+        closeCallback: () => console.log("home-page modal frame closed"),
+        fullscreen: false
+    });
 }
 
 export function onModalPage(args: EventData) {
     const view = args.object as View;
-    view.showModal("modal/modal-page",
-        { frameless: true },
-        () => console.log("home-page modal page closed"),
-        false);
+    view.showModal("modal/modal-page", {
+        context: { frameless: true },
+        closeCallback: () => console.log("home-page modal page closed"),
+        fullscreen: false
+    });
 }
 
 export function onModalLayout(args: EventData) {
     const view = args.object as View;
-    view.showModal("modal-layout/modal-layout-root",
-        "context",
-        () => console.log("home-page modal layout closed"),
-        false);
+    view.showModal("modal-layout/modal-layout-root", {
+        context: "context",
+        closeCallback: () => console.log("home-page modal layout closed"),
+        fullscreen: false
+    });
 }
 
 export function onAndroidBackEvents(args: EventData) {
     const view = args.object as View;
-    view.showModal(
-        "android-back-button/android-back-button-page",
-        null,
-        () => console.log("android-back-button modal page layout closed"),
-        true, true, true);
+    view.showModal("android-back-button/android-back-button-page", {
+        context: null,
+        closeCallback: () => console.log("android-back-button modal page layout closed"),
+        fullscreen: true, 
+        animated: true, 
+        stretched: true
+    });
 }
 
 export function onModalTabView(args: EventData) {
-    const fullscreen = false;
-    const animated = false;
-    const stretched = true;
-
     const view = args.object as View;
-    view.showModal("modal-tab/modal-tab-root",
-        { frameless: true },
-        () => console.log("home-page modal tabview closed"),
-        fullscreen,
-        animated,
-        stretched);
+    view.showModal("modal-tab/modal-tab-root", {
+        context: { frameless: true },
+        closeCallback: () => console.log("home-page modal tabview closed"),
+        fullscreen: false,
+        animated: false,
+        stretched: true
+    });
 }
 
 export function onNavigate(args: EventData) {
diff --git a/e2e/modal-navigation/app/modal-nested/modal-nested-page.ts b/e2e/modal-navigation/app/modal-nested/modal-nested-page.ts
index 125b9a3ee..ac9afe51e 100644
--- a/e2e/modal-navigation/app/modal-nested/modal-nested-page.ts
+++ b/e2e/modal-navigation/app/modal-nested/modal-nested-page.ts
@@ -1,4 +1,3 @@
-import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import { NavigatedData } from "tns-core-modules/ui/page";
 import { View, EventData } from "tns-core-modules/ui/core/view";
 
diff --git a/e2e/modal-navigation/app/modal-no-page/modal-no-page.ts b/e2e/modal-navigation/app/modal-no-page/modal-no-page.ts
index 2652b50bd..773e67664 100644
--- a/e2e/modal-navigation/app/modal-no-page/modal-no-page.ts
+++ b/e2e/modal-navigation/app/modal-no-page/modal-no-page.ts
@@ -1,8 +1,4 @@
-import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
-import { NavigatedData, Page } from "tns-core-modules/ui/page";
 import { View, EventData } from "tns-core-modules/ui/core/view";
-import { Frame, ShownModallyData } from "tns-core-modules/ui/frame";
-import { fromObject } from "tns-core-modules/data/observable";
 import { confirm } from "tns-core-modules/ui/dialogs";
 
 export function onLoaded(args) {
diff --git a/e2e/modal-navigation/app/modal-second/modal-second-page.ts b/e2e/modal-navigation/app/modal-second/modal-second-page.ts
index cc489fba8..f1f1db001 100644
--- a/e2e/modal-navigation/app/modal-second/modal-second-page.ts
+++ b/e2e/modal-navigation/app/modal-second/modal-second-page.ts
@@ -1,7 +1,5 @@
-import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import { NavigatedData, Page } from "tns-core-modules/ui/page";
 import { View, EventData } from "tns-core-modules/ui/core/view";
-import { Frame } from "tns-core-modules/ui/frame";
 
 export function onNavigatingTo(args: NavigatedData) {
     console.log("second-page onNavigatingTo");
diff --git a/e2e/modal-navigation/app/modal/modal-page.ts b/e2e/modal-navigation/app/modal/modal-page.ts
index 6de08686d..2ba9f99aa 100644
--- a/e2e/modal-navigation/app/modal/modal-page.ts
+++ b/e2e/modal-navigation/app/modal/modal-page.ts
@@ -1,4 +1,3 @@
-import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import { NavigatedData, Page } from "tns-core-modules/ui/page";
 import { View, EventData } from "tns-core-modules/ui/core/view";
 import { Frame, ShownModallyData } from "tns-core-modules/ui/frame";
@@ -46,19 +45,21 @@ export function showNestedModalFrame(args: EventData) {
     const frame = new Frame();
     frame.navigate("modal-nested/modal-nested-page");
 
-    view.showModal(frame,
-        "nested-context",
-        () => console.log("modal frame nested closed"),
-        false);
+    view.showModal(frame, {
+        context: "nested-context",
+        closeCallback: () => console.log("modal frame nested closed"),
+        fullscreen: false
+    });
 }
 
 export function showNestedModalPage(args: EventData) {
     const view = args.object as View;
 
-    view.showModal("modal-nested/modal-nested-page",
-        "nested-context",
-        () => console.log("modal page nested closed"),
-        false);
+    view.showModal("modal-nested/modal-nested-page", {
+        context: "nested-context",
+        closeCallback: () => console.log("modal page nested closed"),
+        fullscreen: false
+    });
 }
 
 export function onNavigate(args: EventData) {
diff --git a/e2e/modal-navigation/app/second/second-page.ts b/e2e/modal-navigation/app/second/second-page.ts
index 9b4514fb4..afcaaf791 100644
--- a/e2e/modal-navigation/app/second/second-page.ts
+++ b/e2e/modal-navigation/app/second/second-page.ts
@@ -1,4 +1,3 @@
-import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import { NavigatedData, Page } from "tns-core-modules/ui/page";
 import { View, EventData } from "tns-core-modules/ui/core/view";
 import { Frame } from "tns-core-modules/ui/frame";
@@ -31,16 +30,18 @@ export function onModalFrame(args: EventData) {
     const frame = new Frame();
     frame.navigate("modal/modal-page");
 
-    view.showModal(frame,
-        "context",
-        () => console.log("home-page modal frame closed"),
-        false);
+    view.showModal(frame, {
+        context: "context",
+        closeCallback: () => console.log("home-page modal frame closed"),
+        fullscreen: false
+    });
 }
 
 export function onModalPage(args: EventData) {
     const view = args.object as View;
-    view.showModal("modal/modal-page",
-        { frameless: true },
-        () => console.log("home-page modal page closed"),
-        false);
+    view.showModal("modal/modal-page", {
+        context: { frameless: true },
+        closeCallback: () => console.log("home-page modal page closed"),
+        fullscreen: false
+    });
 }
diff --git a/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts
index bf978fba9..94dd21502 100644
--- a/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts
+++ b/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts
@@ -3,7 +3,6 @@ import { Screen, driverDefaultWaitTime } from "./screen"
 import {
     roots,
     modalPageBackground,
-    testSecondPageBackground,
     testNestedModalFrameBackground,
     testNestedModalPageBackground,
     testDialogBackground
diff --git a/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts
index ddfde1168..adebdb90d 100644
--- a/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts
+++ b/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts
@@ -2,7 +2,6 @@ import { AppiumDriver, createDriver, nsCapabilities } from "nativescript-dev-app
 import { Screen, driverDefaultWaitTime } from "./screen"
 import {
     roots,
-    modalFrameBackground,
     modalTabViewBackground,
     testSecondPageBackground,
     testSecondPageClose,
diff --git a/e2e/modal-navigation/e2e/shared.e2e-spec.ts b/e2e/modal-navigation/e2e/shared.e2e-spec.ts
index c1f6dd3a6..72cf61a31 100644
--- a/e2e/modal-navigation/e2e/shared.e2e-spec.ts
+++ b/e2e/modal-navigation/e2e/shared.e2e-spec.ts
@@ -1,4 +1,4 @@
-import { AppiumDriver, createDriver } from "nativescript-dev-appium";
+import { AppiumDriver } from "nativescript-dev-appium";
 import { Screen } from "./screen"
 
 const time = 1;
diff --git a/e2e/ui-tests-app/app/action-bar/modal-test-hidden-action-bar-page.ts b/e2e/ui-tests-app/app/action-bar/modal-test-hidden-action-bar-page.ts
index ea6c372a1..62eac666c 100644
--- a/e2e/ui-tests-app/app/action-bar/modal-test-hidden-action-bar-page.ts
+++ b/e2e/ui-tests-app/app/action-bar/modal-test-hidden-action-bar-page.ts
@@ -3,9 +3,11 @@ import { Page } from "tns-core-modules/ui/page";
 import { topmost } from "tns-core-modules/ui/frame";
 
 export function btnClick(args: EventData) {
-    (<Page>args.object).page.showModal("action-bar/modal-page", "", function (arg: string) {
-        console.log("Callback args: " + arg);
-    }, true);
+    (<Page>args.object).page.showModal("action-bar/modal-page", {
+        context: "", 
+        closeCallback: (arg: string) => console.log("Callback args: " + arg),
+        fullscreen: true
+    });
 }
 
 export function btnBack(args: EventData) {
diff --git a/e2e/ui-tests-app/app/action-bar/modal-test-with-action-bar-page.ts b/e2e/ui-tests-app/app/action-bar/modal-test-with-action-bar-page.ts
index 440fc34f9..f9fef469b 100644
--- a/e2e/ui-tests-app/app/action-bar/modal-test-with-action-bar-page.ts
+++ b/e2e/ui-tests-app/app/action-bar/modal-test-with-action-bar-page.ts
@@ -3,10 +3,11 @@ import { Page } from "tns-core-modules/ui/page";
 import { topmost } from "tns-core-modules/ui/frame";
 
 export function btnClick(args: EventData) {
-    (<Page>args.object).page.showModal("action-bar/modal-page-hidden-action-bar-page", "", function (arg: string) {
-        // ...
-        console.log("Callback args: " + arg);
-    }, true);
+    (<Page>args.object).page.showModal("action-bar/modal-page-hidden-action-bar-page", {
+        context: "", 
+        closeCallback: (arg: string) => console.log("Callback args: " + arg),
+        fullscreen: true
+    });
 }
 
 export function btnBack(args: EventData) {
diff --git a/e2e/ui-tests-app/app/app.ts b/e2e/ui-tests-app/app/app.ts
index ba8633c8a..e5658de53 100644
--- a/e2e/ui-tests-app/app/app.ts
+++ b/e2e/ui-tests-app/app/app.ts
@@ -90,6 +90,5 @@ application.on(application.discardedErrorEvent, function(args: application.Disca
 
 application.setCssFileName("app.css");
 
-application.start({ moduleName: "main-page" });
+application._start({ moduleName: "main-page" });
 // application.run({ moduleName: "app-root" });
-// application.run();
diff --git a/e2e/ui-tests-app/app/css/background-image-linear-gradient-page.ts b/e2e/ui-tests-app/app/css/background-image-linear-gradient-page.ts
index dce615cf2..c00a222e7 100644
--- a/e2e/ui-tests-app/app/css/background-image-linear-gradient-page.ts
+++ b/e2e/ui-tests-app/app/css/background-image-linear-gradient-page.ts
@@ -1,5 +1,4 @@
 import * as pages from "tns-core-modules/ui/page";
-import { EventData } from "tns-core-modules/data/observable";
 import * as button from "tns-core-modules/ui/button";
 
 import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
diff --git a/e2e/ui-tests-app/app/css/background-shorthand-page.ts b/e2e/ui-tests-app/app/css/background-shorthand-page.ts
index 27b57f71d..7b0deba87 100644
--- a/e2e/ui-tests-app/app/css/background-shorthand-page.ts
+++ b/e2e/ui-tests-app/app/css/background-shorthand-page.ts
@@ -1,5 +1,4 @@
 import * as pages from "tns-core-modules/ui/page";
-import { EventData } from "tns-core-modules/data/observable";
 import * as button from "tns-core-modules/ui/button";
 
 import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
diff --git a/e2e/ui-tests-app/app/events/console-page.ts b/e2e/ui-tests-app/app/events/console-page.ts
index ad9e75093..4e1fda0a0 100644
--- a/e2e/ui-tests-app/app/events/console-page.ts
+++ b/e2e/ui-tests-app/app/events/console-page.ts
@@ -1,5 +1,4 @@
-import * as app from "tns-core-modules/application";
-import * as pageModule from "tns-core-modules/ui/page";
+import * as pageModule from "tns-core-modules/ui/page";
 import * as labelModule from "tns-core-modules/ui/label";
 import * as stackLayoutModule from "tns-core-modules/ui/layouts/stack-layout";
 import * as textViewModule from "tns-core-modules/ui/text-view";
diff --git a/e2e/ui-tests-app/app/events/layout-changed-event-page.ts b/e2e/ui-tests-app/app/events/layout-changed-event-page.ts
index 9070896e8..316533c61 100644
--- a/e2e/ui-tests-app/app/events/layout-changed-event-page.ts
+++ b/e2e/ui-tests-app/app/events/layout-changed-event-page.ts
@@ -1,8 +1,6 @@
 import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import { Button } from "tns-core-modules/ui/button";
 import { TextView } from "tns-core-modules/ui/text-view";
-import { View } from "tns-core-modules/ui/core/view";
-import { EventData } from "tns-core-modules/data/observable";
 let buttonsCount = 1;
 
 export function onLayoutChanged(args) {
diff --git a/e2e/ui-tests-app/app/image-view/image-asset/view-model-page.ts b/e2e/ui-tests-app/app/image-view/image-asset/view-model-page.ts
index af96a2c98..690744120 100644
--- a/e2e/ui-tests-app/app/image-view/image-asset/view-model-page.ts
+++ b/e2e/ui-tests-app/app/image-view/image-asset/view-model-page.ts
@@ -1,5 +1,4 @@
-import * as dialogs from "tns-core-modules/ui/dialogs";
-import * as observable from "tns-core-modules/data/observable";
+import * as observable from "tns-core-modules/data/observable";
 import * as imageAssetModule from "tns-core-modules/image-asset";
 import { ImageSource } from "tns-core-modules/image-source";
 
diff --git a/e2e/ui-tests-app/app/image-view/stretch-modes-page.ts b/e2e/ui-tests-app/app/image-view/stretch-modes-page.ts
index c75ab9a56..07c72ef34 100644
--- a/e2e/ui-tests-app/app/image-view/stretch-modes-page.ts
+++ b/e2e/ui-tests-app/app/image-view/stretch-modes-page.ts
@@ -1,9 +1,6 @@
 import { Image, Stretch } from "tns-core-modules/ui/image";
 import { Label } from "tns-core-modules/ui/label";
 import { LayoutBase } from "tns-core-modules/ui/layouts/layout-base";
-import { Color } from "tns-core-modules/color";
-import * as imageSource from "tns-core-modules/image-source";
-import { isAndroid } from "tns-core-modules/platform";
 
 const sources = [
     { w: 32, h: 18, src: "i32x18" },
diff --git a/e2e/ui-tests-app/app/issues/issue-3714-page.ts b/e2e/ui-tests-app/app/issues/issue-3714-page.ts
index c7478a190..31ffef6fa 100644
--- a/e2e/ui-tests-app/app/issues/issue-3714-page.ts
+++ b/e2e/ui-tests-app/app/issues/issue-3714-page.ts
@@ -1,9 +1,7 @@
 import { EventData } from "tns-core-modules/data/observable";
 import { Page } from "tns-core-modules/ui/page";
 import { Button } from "tns-core-modules/ui/button";
-import { Label } from "tns-core-modules/ui/label";
 import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
-import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
 
 export function toggle(args: EventData) {
     const page = <Page>((<any>args.object).page);
diff --git a/e2e/ui-tests-app/app/tab-view/tab-view-css-page.ts b/e2e/ui-tests-app/app/tab-view/tab-view-css-page.ts
index 1f0421c93..d5239ff93 100644
--- a/e2e/ui-tests-app/app/tab-view/tab-view-css-page.ts
+++ b/e2e/ui-tests-app/app/tab-view/tab-view-css-page.ts
@@ -1,7 +1,7 @@
 import * as view from "tns-core-modules/ui/core/view";
 import * as pages from "tns-core-modules/ui/page";
 
-export function loaded(args){
+export function loaded(args) {
     var page = <pages.Page>(<view.View>args.object).page;
    const view = page.getViewById("test-element");
    (<any>view).textTransform = "capitalize";
diff --git a/e2e/ui-tests-app/app/tab-view/tab-view-icon-change-page.ts b/e2e/ui-tests-app/app/tab-view/tab-view-icon-change-page.ts
index 6ebd0d4fb..b72993f93 100644
--- a/e2e/ui-tests-app/app/tab-view/tab-view-icon-change-page.ts
+++ b/e2e/ui-tests-app/app/tab-view/tab-view-icon-change-page.ts
@@ -1,5 +1,3 @@
-import { EventData } from "tns-core-modules/data/observable";
-import { Button } from "tns-core-modules/ui/button";
 import { TabView, SelectedIndexChangedEventData } from "tns-core-modules/ui/tab-view";
 
 export function onSelectedIndexChanged(args: SelectedIndexChangedEventData) {
diff --git a/e2e/ui-tests-app/app/tabs/default.ts b/e2e/ui-tests-app/app/tabs/default.ts
index 85a232b6b..6ef17fcfa 100644
--- a/e2e/ui-tests-app/app/tabs/default.ts
+++ b/e2e/ui-tests-app/app/tabs/default.ts
@@ -1,6 +1,4 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { SubMainPageViewModel } from "../sub-main-page-view-model";
-import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
 import { Page } from "tns-core-modules/ui/page";
 import { BottomNavigation } from "tns-core-modules/ui/bottom-navigation";
 
diff --git a/e2e/ui-tests-app/e2e/helpers/image-helper.ts b/e2e/ui-tests-app/e2e/helpers/image-helper.ts
index 09a884b6e..9adcef27a 100644
--- a/e2e/ui-tests-app/e2e/helpers/image-helper.ts
+++ b/e2e/ui-tests-app/e2e/helpers/image-helper.ts
@@ -1,4 +1,4 @@
-import { AppiumDriver, logError, IRectangle, UIElement, logInfo, SearchOptions } from "nativescript-dev-appium";
+import { AppiumDriver, logError, IRectangle, UIElement } from "nativescript-dev-appium";
 import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
 import { assert } from "chai";
 
diff --git a/e2e/ui-tests-app/e2e/helpers/navigation-helper.ts b/e2e/ui-tests-app/e2e/helpers/navigation-helper.ts
index b84ed7cf5..dd04a8685 100644
--- a/e2e/ui-tests-app/e2e/helpers/navigation-helper.ts
+++ b/e2e/ui-tests-app/e2e/helpers/navigation-helper.ts
@@ -1,4 +1,4 @@
-import { AppiumDriver, logError, IRectangle, logInfo, SearchOptions } from "nativescript-dev-appium";
+import { AppiumDriver, IRectangle, logInfo } from "nativescript-dev-appium";
 
 export class NavigationHelper {
 
@@ -56,5 +56,3 @@ export class NavigationHelper {
         throw new Error("Not implemented!");
     }
 }
-
-
diff --git a/e2e/ui-tests-app/e2e/setup.ts b/e2e/ui-tests-app/e2e/setup.ts
index 11b854fca..d53599331 100644
--- a/e2e/ui-tests-app/e2e/setup.ts
+++ b/e2e/ui-tests-app/e2e/setup.ts
@@ -1,5 +1,5 @@
 import { startServer, stopServer, ITestReporter, nsCapabilities, LogImageType } from "nativescript-dev-appium";
-const addContext = require('mochawesome/addContext');
+const addContext = require("mochawesome/addContext");
 
 const testReporterContext = <ITestReporter>{};
 testReporterContext.name = "mochawesome";
diff --git a/e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts
index 7203445ae..6fa315614 100644
--- a/e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts
+++ b/e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts
@@ -1,5 +1,4 @@
-import { AppiumDriver, createDriver, SearchOptions, nsCapabilities } from "nativescript-dev-appium";
-import { assert } from "chai";
+import { AppiumDriver, createDriver, nsCapabilities } from "nativescript-dev-appium";
 import { ButtonBackgroundPage } from "./button-background-page";
 
 describe("button-background-suite", () => {
@@ -76,12 +75,10 @@ describe("button-background-suite", () => {
         await backgroundPage.executeScenario("background_42_position", "42");
     });
 
-
     it("background_43_position", async function () {
         await backgroundPage.executeScenario("background_43_position", "43");
     });
 
-
     it("background_44_position", async function () {
         await backgroundPage.executeScenario("background_44_position", "44");
     });
diff --git a/e2e/ui-tests-app/e2e/suites/tab-view/tab-view-base-page.ts b/e2e/ui-tests-app/e2e/suites/tab-view/tab-view-base-page.ts
index cc3340ffd..df9aea540 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-view/tab-view-base-page.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-view/tab-view-base-page.ts
@@ -1,6 +1,4 @@
-import { AppiumDriver, logInfo, logError } from "nativescript-dev-appium";
-import { Platform } from "mobile-devices-controller";
-import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
+import { AppiumDriver } from "nativescript-dev-appium";
 import { PageObjectBaseModel } from "../../page-object-base-model";
 
 export class TabViewBasePage extends PageObjectBaseModel {
diff --git a/e2e/ui-tests-app/e2e/suites/tab-view/tab-view-common-tests.e2e-suite.ts b/e2e/ui-tests-app/e2e/suites/tab-view/tab-view-common-tests.e2e-suite.ts
index 0f5aab2f5..9a766c0ae 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-view/tab-view-common-tests.e2e-suite.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-view/tab-view-common-tests.e2e-suite.ts
@@ -1,4 +1,4 @@
-import { nsCapabilities, createDriver, AppiumDriver, Direction } from "nativescript-dev-appium";
+import { nsCapabilities, createDriver, AppiumDriver } from "nativescript-dev-appium";
 import { TabViewBasePage } from "./tab-view-base-page";
 import { Platform } from "mobile-devices-controller";
 
@@ -77,10 +77,9 @@ describe("tab-view-common-tests-suite", async function () {
         await tabViewBasePage.navigateBackToSuitMainPage();
     });
 
-
     it("tabView_icon_change", async function () {
         await tabViewBasePage.navigateToSample("tab-view-icon-change");
-        const index = driver.nsCapabilities.device.platform == Platform.IOS
+        const index = driver.nsCapabilities.device.platform === Platform.IOS
             ? (driver.nsCapabilities.device.apiLevel >= 11 ? 2 : 3) : 1;
 
         let btns = await driver.findElementsByClassName(driver.locators.button, 5000);
@@ -88,7 +87,7 @@ describe("tab-view-common-tests-suite", async function () {
         await tabViewBasePage.imageHelper.compareScreen("tabView_icon_change", 5, 0.01);
 
         btns = await driver.findElementsByClassName(driver.locators.button, 5000);
-        await btns[index -1 ].tap();
+        await btns[index - 1].tap();
         await tabViewBasePage.imageHelper.compareScreen("tabView_icon_change", 5, 0.01);
 
         await tabViewBasePage.imageHelper.assertImages();
diff --git a/package.json b/package.json
index 31812ce45..cfb7e2cb8 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "typedoc": "typedoc --tsconfig tsconfig.typedoc.json --out bin/dist/apiref --includeDeclarations --name NativeScript --theme ./node_modules/nativescript-typedoc-theme --excludeExternals --externalPattern \"**/+(tns-core-modules|module).d.ts\"",
     "dev-typedoc": "npm run typedoc && cd bin/dist/apiref && npx http-server",
     "test-tsc-es2016": "npm run tsc -- -p tsconfig.public.es2016.json",
-    "tslint": "tslint --project tsconfig.json --config build/tslint.json 'tns-core-modules/**/*.ts' 'tests/**/*.ts' 'apps/**/*.ts' 'e2e/**/*.ts' -e '**/node_modules/**' -e '**/platforms/**'",
+    "tslint": "tslint --project tsconfig.tslint.json --config build/tslint.json",
     "madge-ios": "tsc --skipLibCheck && tns prepare ios --path tests && madge --circular tests/platforms/ios/tests/app/tns_modules/tns-core-modules",
     "madge-ios-image": "tsc --skipLibCheck && tns prepare ios --path tests && madge --image graph-tests-ios.svg tests/platforms/ios/tests/app/tns_modules/tns-core-modules",
     "madge-android": "tsc --skipLibCheck && tns prepare android --path tests && madge --circular tests/platforms/android/app/src/main/assets/app/tns_modules/tns-core-modules",
diff --git a/tests/app/application/application-tests.android.ts b/tests/app/application/application-tests.android.ts
index c43af40dc..1b7db5ed4 100644
--- a/tests/app/application/application-tests.android.ts
+++ b/tests/app/application/application-tests.android.ts
@@ -1,6 +1,6 @@
 /* tslint:disable:no-unused-variable */
 import * as app from "tns-core-modules/application";
-import * as TKUnit from "../tk-unit"; 
+import * as TKUnit from "../tk-unit";
 
 export * from "./application-tests-common";
 
@@ -40,7 +40,6 @@ if (app.android) {
 export var testAndroidApplicationInitialized = function () {
     TKUnit.assert(app.android, "Android application not initialized.");
     TKUnit.assert(app.android.context, "Android context not initialized.");
-    TKUnit.assert(app.android.currentContext, "Android currentContext not initialized.");
     TKUnit.assert(app.android.foregroundActivity, "Android foregroundActivity not initialized.");
     TKUnit.assert(app.android.foregroundActivity.isNativeScriptActivity, "Andorid foregroundActivity.isNativeScriptActivity is true");
     TKUnit.assert(app.android.startActivity, "Android startActivity not initialized.");
diff --git a/tests/app/data/observable-tests.ts b/tests/app/data/observable-tests.ts
index 6fb6dfbfd..5c9823cde 100644
--- a/tests/app/data/observable-tests.ts
+++ b/tests/app/data/observable-tests.ts
@@ -575,5 +575,6 @@ export function test_fromObjectRecursive_does_not_override_source_object_propert
     const myObj = {};
     const source = { name: "a", value: myObj };
     const observable = fromObjectRecursive(source);
+    TKUnit.assertNotNull(observable);
     TKUnit.assertEqual(source.value, myObj);
-}
\ No newline at end of file
+}
diff --git a/tests/app/http/http-tests.ts b/tests/app/http/http-tests.ts
index f924edffc..1eba2e1d9 100644
--- a/tests/app/http/http-tests.ts
+++ b/tests/app/http/http-tests.ts
@@ -9,11 +9,8 @@ export var test_getString_isDefined = function () {
 };
 
 export var test_getString = function (done: (err: Error, res?: string) => void) {
-    var result;
-
     http.getString("https://httpbin.org/get").then(function (r) {
         //// Argument (r) is string!
-        result = r;
         done(null);
     }, function (e) {
         //// Argument (e) is Error!
@@ -22,13 +19,7 @@ export var test_getString = function (done: (err: Error, res?: string) => void)
 };
 
 export var test_getString_fail = function (done) {
-    var result;
-    var completed: boolean;
-    var isReady = function () { return completed; }
-
     http.getString({ url: "hgfttp://httpbin.org/get", method: "GET", timeout: 2000 }).catch(function (e) {
-        completed = true;
-        result = e;
         done(null)
     });
 };
@@ -330,7 +321,7 @@ export var test_request_responseStatusCodeShouldBeDefined = function (done) {
         var statusCode = response.statusCode;
         result = response;
         try {
-            TKUnit.assert(typeof (result.statusCode) !== "undefined", "response.statusCode should be defined!");
+            TKUnit.assert(typeof (statusCode) !== "undefined", "response.statusCode should be defined!");
             done(null);
         }
         catch (err) {
@@ -384,9 +375,6 @@ export var test_request_responseContentShouldBeDefined = function (done) {
     http.request({ url: "https://httpbin.org/get", method: "GET" }).then(function (response) {
         //// Argument (response) is HttpResponse!
         //// Content property of the response is HttpContent!
-        var str = response.content.toString();
-        var obj = response.content.toJSON();
-        var img = response.content.toImage();
         result = response;
         try {
             TKUnit.assert(typeof (result.content) !== "undefined", "response.content should be defined!");
diff --git a/tests/app/image-source/image-source-tests.ts b/tests/app/image-source/image-source-tests.ts
index 63f9ba8d6..712015d3d 100644
--- a/tests/app/image-source/image-source-tests.ts
+++ b/tests/app/image-source/image-source-tests.ts
@@ -3,7 +3,6 @@ import * as imageAssetModule from "tns-core-modules/image-asset";
 import * as fs from "tns-core-modules/file-system";
 import * as app from "tns-core-modules/application";
 import * as TKUnit from "../tk-unit";
-import * as platform from "tns-core-modules/platform";
 
 const imagePath = "~/assets/logo.png";
 const splashscreenPath = "~/assets/splashscreen.png";
@@ -86,7 +85,7 @@ export function testFromAssetFileNotFound(done) {
         keepAspectRatio: true
     };
 
-    let img = imageSource.fromAsset(asset).then((source) => {
+    imageSource.fromAsset(asset).then((source) => {
         done("Should not resolve with invalid file name.");
     }, (error) => {
         TKUnit.assertNotNull(error);
@@ -102,7 +101,7 @@ export function testFromAssetSimple(done) {
         keepAspectRatio: true
     };
 
-    let img = imageSource.fromAsset(asset).then((source) => {
+    imageSource.fromAsset(asset).then((source) => {
         TKUnit.assertEqual(source.width, splashscreenWidth);
         TKUnit.assertEqual(source.height, splashscreenHeight);
         done();
@@ -157,7 +156,7 @@ export function testFromAssetWithScalingAndAspectRatio(done) {
         keepAspectRatio: true
     };
 
-    let img = imageSource.fromAsset(asset).then((source) => {
+    imageSource.fromAsset(asset).then((source) => {
         TKUnit.assertEqual(source.width, 18);
         TKUnit.assertEqual(source.height, scaleHeight);
         done();
@@ -173,7 +172,7 @@ export function testFromAssetWithScalingAndDefaultAspectRatio(done) {
     asset.options.width = scaleWidth;
     asset.options.height = scaleHeight;
 
-    let img = imageSource.fromAsset(asset).then((source) => {
+    imageSource.fromAsset(asset).then((source) => {
         TKUnit.assertEqual(source.width, 18);
         TKUnit.assertEqual(source.height, scaleHeight);
         done();
@@ -192,7 +191,7 @@ export function testFromAssetWithBiggerScaling(done) {
         keepAspectRatio: false
     };
 
-    let img = imageSource.fromAsset(asset).then((source) => {
+    imageSource.fromAsset(asset).then((source) => {
         TKUnit.assertEqual(source.width, scaleWidth);
         TKUnit.assertEqual(source.height, scaleHeight);
         done();
diff --git a/tests/app/navigation/navigation-tests.ts b/tests/app/navigation/navigation-tests.ts
index 730fe6d67..60557ee0a 100644
--- a/tests/app/navigation/navigation-tests.ts
+++ b/tests/app/navigation/navigation-tests.ts
@@ -2,7 +2,6 @@
 import { EventData, Page, NavigatedData } from "tns-core-modules/ui/page";
 import { topmost as topmostFrame, NavigationTransition } from "tns-core-modules/ui/frame";
 import { StackLayout, } from "tns-core-modules/ui/layouts/stack-layout";
-import { GridLayout, } from "tns-core-modules/ui/layouts/grid-layout";
 import { Color } from "tns-core-modules/color";
 import * as helper from "../ui-helper";
 import * as frame from "tns-core-modules/ui/frame";
@@ -110,7 +109,7 @@ export function test_backAndForwardParentPage_nestedFrames() {
     back(2);
     TKUnit.waitUntilReady(() => topmostFrame().navigationQueueIsEmpty());
 
-    const frameStack = frame.stack();
+    const frameStack = frame._stack();
     TKUnit.assertEqual(frameStack.length, 1, "There should be only one frame left in the stack");
     TKUnit.assertEqual(topmostFrame().currentPage, mainTestPage, "We should be on the main test page at the end of the test.");
 }
@@ -181,7 +180,7 @@ export function test_backToEntry_WithTransition() {
 
 function _test_ClearHistory(transition?: NavigationTransition) {
     let topmost = topmostFrame();
-    let x = 0;
+
     helper.navigateWithEntry({ create: pageFactory, clearHistory: true, transition: transition, animated: !!transition });
     TKUnit.assertEqual(topmost.backStack.length, 0, "1.topmost.backStack.length");
     TKUnit.assertEqual(topmost.canGoBack(), false, "1.topmost.canGoBack().");
@@ -239,12 +238,6 @@ export function test_ClearHistoryWithTransitionDoesNotBreakNavigation() {
 export function test_ClearHistoryWithTransitionDoesNotBreakNavigation_WithLocalTransition() {
     const topmost = topmostFrame();
 
-    let originalCachePagesOnNavigate: boolean;
-    if (topmost.android) {
-        originalCachePagesOnNavigate = topmost.android.cachePagesOnNavigate;
-        topmostFrame().android.cachePagesOnNavigate = true;
-    }
-
     let mainTestPage = topmost.currentPage;
     let mainPageFactory = function (): Page {
         return mainTestPage;
@@ -262,10 +255,6 @@ export function test_ClearHistoryWithTransitionDoesNotBreakNavigation_WithLocalT
     // Go back to main
     helper.navigateWithEntry({ create: mainPageFactory, clearHistory: true, transition: { name: "fade", duration: 10 }, animated: true });
 
-    if (topmost.android) {
-        topmostFrame().android.cachePagesOnNavigate = originalCachePagesOnNavigate;
-    }
-
     TKUnit.assertEqual(topmost.currentPage, mainTestPage, "We should be on the main test page at the end of the test.");
     TKUnit.assertEqual(topmost.backStack.length, 0, "Back stack should be empty at the end of the test.");
 }
@@ -478,4 +467,4 @@ function _test_Navigate_From_Page_Event_Handler(eventName: string) {
     helper.navigateWithEntry({ create: firstPageFactory });
 
     TKUnit.waitUntilReady(() => secondPageNavigatedTo);
-}
\ No newline at end of file
+}
diff --git a/tests/app/navigation/transition-tests.ts b/tests/app/navigation/transition-tests.ts
index 690772cfd..5da33733e 100644
--- a/tests/app/navigation/transition-tests.ts
+++ b/tests/app/navigation/transition-tests.ts
@@ -2,7 +2,7 @@
 import * as platform from "tns-core-modules/platform";
 import * as trace from "tns-core-modules/trace";
 import { Color } from "tns-core-modules/color";
-import { NavigationEntry, NavigationTransition, topmost as topmostFrame } from "tns-core-modules/ui/frame";
+import { NavigationEntry, NavigationTransition } from "tns-core-modules/ui/frame";
 import { Page } from "tns-core-modules/ui/page";
 import { AnimationCurve } from "tns-core-modules/ui/enums"
 import { CustomTransition } from "./custom-transition";
@@ -27,12 +27,6 @@ function _testTransition(navigationTransition: NavigationTransition) {
 }
 
 export function test_Transitions() {
-    const topmost = topmostFrame();
-    const mainTestPage = topmost.currentPage;
-    const mainPageFactory = function (): Page {
-        return mainTestPage;
-    };
-
     helper.navigate(() => {
         const page = new Page();
         page.id = "TransitionsTestPage_MAIN"
@@ -59,4 +53,4 @@ export function test_Transitions() {
     });
 
     // helper.navigateWithEntry({ create: mainPageFactory, clearHistory: true, animated: false });
-}
\ No newline at end of file
+}
diff --git a/tests/app/pages/app.ts b/tests/app/pages/app.ts
deleted file mode 100644
index db3999631..000000000
--- a/tests/app/pages/app.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import * as application from "tns-core-modules/application";
-application.start({ moduleName: "pages/page14" });
diff --git a/tests/app/pages/navigation/pageA.ts b/tests/app/pages/navigation/pageA.ts
index bf526ee01..462fc8365 100644
--- a/tests/app/pages/navigation/pageA.ts
+++ b/tests/app/pages/navigation/pageA.ts
@@ -6,9 +6,6 @@ import * as text from "tns-core-modules/ui/text-field";
 import * as color from "tns-core-modules/color";
 import * as list from "tns-core-modules/ui/list-view";
 
-//// Enable page caching
-//frame.topmost().android.cachePagesOnNavigate = true;
-
 export function createPage() {
     var page = new pages.Page();
     var stack = new stackModule.StackLayout();
diff --git a/tests/app/pages/page20.ts b/tests/app/pages/page20.ts
index 4181d1d8b..77c419073 100644
--- a/tests/app/pages/page20.ts
+++ b/tests/app/pages/page20.ts
@@ -7,5 +7,5 @@ trace.enable();
 
 export function onTap(args: observable.EventData) {
     var btn = <Button>args.object;
-    (<Page>btn.page).showModal("tests/pages/page21", null, null);
+    (<Page>btn.page).showModal("tests/pages/page21", { context: null, closeCallback: null });
 }
diff --git a/tests/app/pages/sandbox-project.ts b/tests/app/pages/sandbox-project.ts
deleted file mode 100644
index d4b88b40a..000000000
--- a/tests/app/pages/sandbox-project.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import * as application from "tns-core-modules/application";
-application.start({ moduleName: "apps/tests/pages/nnikolovTestPage" });
diff --git a/tests/app/styling/app.ts b/tests/app/styling/app.ts
deleted file mode 100644
index 051c73290..000000000
--- a/tests/app/styling/app.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as application from "tns-core-modules/application";
-
-import * as trace from "tns-core-modules/trace";
-trace.enable();
-trace.setCategories(trace.categories.concat(
-    trace.categories.Layout
-//, trace.categories.NativeLifecycle
-//, trace.categories.Navigation
-//, trace.categories.ViewHierarchy
-//, trace.categories.VisualTreeEvents
-    ));
-
-application.start({ moduleName: "styling/mainPage" });
diff --git a/tests/app/styling/mainPage.ts b/tests/app/styling/mainPage.ts
deleted file mode 100644
index 4b90c65f0..000000000
--- a/tests/app/styling/mainPage.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import * as pagesModule from "tns-core-modules/ui/page";
-import * as enums from "tns-core-modules/ui/enums";
-import * as stackLayoutModule from "tns-core-modules/ui/layouts/stack-layout";
-import * as buttonModule from "tns-core-modules/ui/button";
-import * as labelModule from "tns-core-modules/ui/label";
-import * as textFieldModule from "tns-core-modules/ui/text-field";
-import * as textViewModule from "tns-core-modules/ui/text-view";
-import * as colorModule from "tns-core-modules/color";
-
-export function createPage() {
-    var width = 200;
-    var textAlignment = enums.TextAlignment.right;
-
-    var stack = new stackLayoutModule.StackLayout();
-    var view;
-
-    view = new buttonModule.Button();
-    view.width = width;
-    view.style.backgroundColor = new colorModule.Color("Blue");
-    view.style.textAlignment = textAlignment;
-    view.text = "Button";
-    stack.addChild(view);
-
-    view = new labelModule.Label();
-    view.width = width;
-    view.text = "Label";
-    view.style.backgroundColor = new colorModule.Color("Green");
-    view.style.textAlignment = textAlignment;
-    stack.addChild(view);
-
-    view = new textFieldModule.TextField();
-    view.width = width;
-    view.text = "TextField";
-    view.style.backgroundColor = new colorModule.Color("Yellow");
-    view.style.textAlignment = textAlignment;
-    stack.addChild(view);
-
-    view = new textViewModule.TextView();
-    view.width = width;
-    view.text = "TextView";
-    view.style.backgroundColor = new colorModule.Color("Red");
-    view.style.textAlignment = textAlignment;
-    stack.addChild(view);
-
-    var page = new pagesModule.Page();
-    page.content = stack;
-    return page;
-}
-//export var Page = page;
diff --git a/tests/app/styling/package.json b/tests/app/styling/package.json
deleted file mode 100644
index 596b14ed4..000000000
--- a/tests/app/styling/package.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "name" : "styling",
-  "main" : "app.js" }
diff --git a/tests/app/timer/timer-tests.ts b/tests/app/timer/timer-tests.ts
index bba1a6f3e..1e8d8664e 100644
--- a/tests/app/timer/timer-tests.ts
+++ b/tests/app/timer/timer-tests.ts
@@ -133,7 +133,6 @@ export function test_setInterval_callbackCalledDuringPeriod(done) {
 
 export function test_setInterval_callbackCalledWithExtraArgs(done) {
     let counter: number = 0;
-    const expected: number = 4;
     const rnd: number = Math.random();
 
     const start = TKUnit.time();
@@ -148,8 +147,6 @@ export function test_setInterval_callbackCalledWithExtraArgs(done) {
 };
 
 export function test_setInterval_callbackShouldBeCleared(done) {
-    let counter = 0;
-
     const start = TKUnit.time();
     // >> timer-set-interval
     const id = timer.setInterval(() => {
@@ -211,4 +208,4 @@ export function test_clearTimeout_insideCallback() {
 
     TKUnit.waitUntilReady(() => completed, 0.5);
     TKUnit.assert(completed, "Callback should be called");
-}
\ No newline at end of file
+}
diff --git a/tests/app/ui/animation/css-animation-tests.ts b/tests/app/ui/animation/css-animation-tests.ts
index 485784dc9..b44eab11b 100644
--- a/tests/app/ui/animation/css-animation-tests.ts
+++ b/tests/app/ui/animation/css-animation-tests.ts
@@ -144,7 +144,7 @@ export function test_ReadTransformNone() {
 
 export function test_ReadScale() {
     const animation = createAnimationFromCSS(".test { animation-name: test; } @keyframes test { to { transform: scale(-5, 12.3pt); } }", "test");
-    const { scale, rotate } = getTransforms(animation.keyframes[0].declarations);
+    const { scale } = getTransforms(animation.keyframes[0].declarations);
 
     TKUnit.assertEqual(scale.property, "scale");
     TKUnit.assertAreClose(scale.value.x, -5, DELTA);
@@ -213,7 +213,7 @@ export function test_ReadTranslate() {
 
 export function test_ReadTranslateSingle() {
     const animation = createAnimationFromCSS(".test { animation-name: test; } @keyframes test { to { transform: translate(30); } }", "test");
-    const { translate, rotate } = getTransforms(animation.keyframes[0].declarations);
+    const { translate } = getTransforms(animation.keyframes[0].declarations);
 
     TKUnit.assertEqual(translate.property, "translate");
     TKUnit.assertAreClose(translate.value.x, 30, DELTA);
@@ -387,7 +387,7 @@ export function test_ExecuteCSSAnimation() {
 
 //    TKUnit.assertEqual(label.backgroundColor, undefined, "label.backgroundColor should be undefind");
 
-//    label.className = "l";    
+//    label.className = "l";
 //    TKUnit.assertEqual(label.backgroundColor, undefined, "label.backgroundColor should be undefind");
 
 //    label.className = "l2";
diff --git a/tests/app/ui/bottom-navigation/bottom-navigation-navigation-tests.ts b/tests/app/ui/bottom-navigation/bottom-navigation-navigation-tests.ts
index 89973b723..d22bb5c74 100644
--- a/tests/app/ui/bottom-navigation/bottom-navigation-navigation-tests.ts
+++ b/tests/app/ui/bottom-navigation/bottom-navigation-navigation-tests.ts
@@ -1,10 +1,9 @@
 import * as TKUnit from "../../tk-unit";
 import * as helper from "../../ui-helper";
-import { isIOS, isAndroid } from "tns-core-modules/platform";
 import { Label } from "tns-core-modules/ui/label";
 import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import * as frameModule from "tns-core-modules/ui/frame";
-import { Page, NavigatedData } from "tns-core-modules/ui/page";
+import { Page } from "tns-core-modules/ui/page";
 import { ListView, ItemEventData } from "tns-core-modules/ui/list-view";
 import { BottomNavigation, TabContentItem, TabStrip, TabStripItem } from "tns-core-modules/ui/bottom-navigation";
 import { Button } from "tns-core-modules/ui/button";
@@ -134,12 +133,6 @@ export function testBackNavigationToTabViewWithNestedFramesShouldWork() {
 export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithAListViewTheListViewIsThere() {
     var topFrame = frameModule.topmost();
 
-    let oldChache;
-    if (topFrame.android) {
-        oldChache = topFrame.android.cachePagesOnNavigate;
-        topFrame.android.cachePagesOnNavigate = true;
-    }
-
     let tabViewPage: Page;
     let tabView: BottomNavigation;
 
@@ -187,10 +180,6 @@ export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithALis
 
     TKUnit.waitUntilReady(() => topFrame.currentPage === rootPage);
 
-    if (topFrame.android) {
-        topFrame.android.cachePagesOnNavigate = oldChache;
-    }
-
     TKUnit.assert(tabView.items[0].view instanceof ListView, "ListView should be created when navigating back to the main page.");
 }
 
diff --git a/tests/app/ui/bottom-navigation/bottom-navigation-tests-native.ios.ts b/tests/app/ui/bottom-navigation/bottom-navigation-tests-native.ios.ts
index 47cea99ca..5d197bd12 100644
--- a/tests/app/ui/bottom-navigation/bottom-navigation-tests-native.ios.ts
+++ b/tests/app/ui/bottom-navigation/bottom-navigation-tests-native.ios.ts
@@ -1,6 +1,4 @@
 import tabViewModule = require("tns-core-modules/ui/tab-view");
-import * as utils from "tns-core-modules/utils/utils";
-import getter = utils.ios.getter;
 
 export function getNativeTabCount(tabView: tabViewModule.TabView): number {
     if (!tabView.ios.viewControllers) {
@@ -33,4 +31,4 @@ export function getNativeFont(tabView: tabViewModule.TabView): UIFont {
 
 export function getOriginalFont(tabView: tabViewModule.TabView): UIFont {
     return tabView.style.fontInternal.getUIFont(UIFont.systemFontOfSize(10));
-}
\ No newline at end of file
+}
diff --git a/tests/app/ui/bottom-navigation/bottom-navigation-tests.ts b/tests/app/ui/bottom-navigation/bottom-navigation-tests.ts
index 76741f0d0..bfc83189e 100644
--- a/tests/app/ui/bottom-navigation/bottom-navigation-tests.ts
+++ b/tests/app/ui/bottom-navigation/bottom-navigation-tests.ts
@@ -1,12 +1,10 @@
 import { UITest } from "../../ui-test";
 import { Label } from "tns-core-modules/ui/label";
-import { unsetValue } from "tns-core-modules/ui/core/view";
 import * as TKUnit from "../../tk-unit";
 import * as helper from "../../ui-helper";
 import * as tabViewTestsNative from "./bottom-navigation-tests-native";
 
 import { BottomNavigation, TabContentItem, TabStrip, TabStripItem, SelectedIndexChangedEventData } from "tns-core-modules/ui/bottom-navigation";
-import { constants } from "zlib";
 
 export class BottomNavigationTest extends UITest<BottomNavigation> {
 
diff --git a/tests/app/ui/builder/builder-tests.ts b/tests/app/ui/builder/builder-tests.ts
index 00aeeeb30..f73a16b3e 100644
--- a/tests/app/ui/builder/builder-tests.ts
+++ b/tests/app/ui/builder/builder-tests.ts
@@ -1,5 +1,5 @@
 import { path } from "tns-core-modules/file-system";
-import { loadPage } from "tns-core-modules/ui/builder";
+import { _loadPage } from "tns-core-modules/ui/builder";
 import { assertEqual, assertNull, assertThrows } from "../../tk-unit";
 
 const COMPONENT_MODULE = "component-module";
@@ -10,7 +10,7 @@ const testDir = "ui/builder";
 function getViewComponent(componentModule: string) {
     const moduleNamePath = path.join(testDir, componentModule);
     const fileName = path.join(testDir, `${componentModule}.xml`);
-    const view = loadPage(moduleNamePath, fileName);
+    const view = _loadPage(moduleNamePath, fileName);
     return view;
 }
 
diff --git a/tests/app/ui/dependency-observable-tests.ts b/tests/app/ui/dependency-observable-tests.ts
deleted file mode 100644
index 852512f07..000000000
--- a/tests/app/ui/dependency-observable-tests.ts
+++ /dev/null
@@ -1,367 +0,0 @@
-// <snippet module="ui/core/dependency-observable" title="dependency-observable">
-// # DependencyObservable
-// DependencyObservable is a fundamental building block in the NativeScript visual tree (DOM).
-// It provides enhanced property system allowing for various value modifiers on a per property basis.
-// This enables cascading values - e.g. default vs. inherited vs. local.
-// Load the module using the following code:
-// ``` JavaScript
-import * as dependencyObservableModule from "tns-core-modules/ui/core/dependency-observable";
-// ```
-// </snippet>
-
-import * as TKUnit from "../tk-unit";
-import * as types from "tns-core-modules/utils/types";
-import * as observableModule from "tns-core-modules/data/observable";
-
-var currentChangeData: dependencyObservableModule.PropertyChangeData;
-var propertyNameCount = 0;
-
-function generatePropertyName() {
-    var name = "test" + propertyNameCount++;
-    return name;
-}
-
-function onTestPropertyChanged(data: dependencyObservableModule.PropertyChangeData) {
-    currentChangeData = data;
-}
-
-function validateDOChangeData(obj: TestDO, property: dependencyObservableModule.Property, oldValue: any, newValue: any) {
-    TKUnit.assert(types.isDefined(currentChangeData), "metadata.onValueChanged function not called.");
-    TKUnit.assert(currentChangeData.object === obj, "metadata.onValueChanged function called with wrong object member.");
-    TKUnit.assert(currentChangeData.property === property, "metadata.onValueChanged method called with wrong property member");
-    TKUnit.assert(currentChangeData.newValue === newValue, "metadata.onValueChanged method called with wrong newValue member");
-    TKUnit.assert(currentChangeData.oldValue === oldValue, "metadata.onValueChanged method called with wrong oldValue member");
-    TKUnit.assert(currentChangeData.eventName === observableModule.Observable.propertyChangeEvent, "metadata.onValueChanged method called with wrong eventName member");
-}
-
-function validateChangeData(data: observableModule.PropertyChangeData, obj: observableModule.Observable, propertyName: string, newValue: any) {
-    TKUnit.assert(types.isDefined(data), "DependencyObservable.on for propertyChange not called.");
-    TKUnit.assert(data.object === obj, "DependencyObservable.on called with wrong object member.");
-    TKUnit.assert(data.propertyName === propertyName, "DependencyObservable.on called with wrong propertyName member");
-    TKUnit.assert(data.value === newValue, "DependencyObservable.on called with wrong value member");
-    TKUnit.assert(data.eventName === observableModule.Observable.propertyChangeEvent, "DependencyObservable.on method called with wrong eventName member");
-}
-
-// <snippet module="ui/core/dependency-observable" title="dependency-observable">
-// ### Creating a Property
-// The property backing mechanism in each DependencyObservable instance is implemented via the Property class.
-// Basically you create a new Property for a class (type):
-// ``` JavaScript
-var testProperty = new dependencyObservableModule.Property(
-    "test",
-    "TestDO",
-    new dependencyObservableModule.PropertyMetadata(
-        false,
-        dependencyObservableModule.PropertyMetadataSettings.None /*0*/,
-        onTestPropertyChanged
-        )
-    );
-// ```
-// </snippet>
-
-var testProperty1 = new dependencyObservableModule.Property(
-    "test1",
-    "TestDO",
-    new dependencyObservableModule.PropertyMetadata(
-        0,
-        dependencyObservableModule.PropertyMetadataSettings.None /*0*/,
-        onTestPropertyChanged
-        )
-    );
-
-function validateProperty(value: any): boolean {
-    return types.isNumber(value) && value >= 0;
-}
-var testPropertyWithValidation = new dependencyObservableModule.Property(
-    "testWithValidation",
-    "TestDO",
-    new dependencyObservableModule.PropertyMetadata(
-        0,
-        dependencyObservableModule.PropertyMetadataSettings.None /*0*/,
-        onTestPropertyChanged,
-        validateProperty
-        )
-    );
-
-class TestDO extends dependencyObservableModule.DependencyObservable {
-    get test(): boolean {
-        return this._getValue(testProperty);
-    }
-    set test(value: boolean) {
-        this._setValue(testProperty, value);
-    }
-
-    get test1(): number {
-        return this._getValue(testProperty1);
-    }
-    set test1(value: number) {
-        this._setValue(testProperty1, value);
-    }
-
-    get testWithValidation(): number {
-        return this._getValue(testPropertyWithValidation);
-    }
-    set testWithValidation(value: number) {
-        this._setValue(testPropertyWithValidation, value);
-    }
-
-    public _onPropertyChanged(property: dependencyObservableModule.Property, oldValue: any, newValue: any) {
-        super._onPropertyChanged(property, oldValue, newValue);
-    }
-}
-
-export function test_DO_Members_AreDefined() {
-    var obj = new dependencyObservableModule.DependencyObservable();
-    TKUnit.assert(types.isDefined(obj._setValue), "DependencyObservable._setValue is undefined.");
-    TKUnit.assert(types.isDefined(obj._getValue), "DependencyObservable._getValue is undefined.");
-    TKUnit.assert(types.isDefined(obj._getValueSource), "DependencyObservable._getValueSource is undefined.");
-    TKUnit.assert(types.isDefined(obj._resetValue), "DependencyObservable._resetValue is undefined.");
-    TKUnit.assert(types.isDefined(obj._onPropertyChanged), "DependencyObservable._resetValue is undefined.");
-    TKUnit.assert(types.isDefined(obj._eachSetProperty), "DependencyObservable._resetValue is undefined.");
-}
-
-export function test_NewProperty_WillThrow_If_Name_IsInvalid() {
-    var thrown = false;
-    try {
-        /* tslint:disable:no-unused-variable */
-        var p = new dependencyObservableModule.Property("", "", undefined);
-        /* tslint:enable:no-unused-variable */
-    }
-    catch (e) {
-        thrown = true;
-        TKUnit.assert(e.message === "Name should not be null or empty string.", "Invalid error message");
-    }
-
-    TKUnit.assert(thrown, "Should not create a Property with invalid name.");
-}
-
-export function test_NewProperty_WillThrow_If_OwnerType_IsInvalid() {
-    var thrown = false;
-    try {
-        /* tslint:disable:no-unused-variable */
-        var p = new dependencyObservableModule.Property(generatePropertyName(), "", undefined);
-        /* tslint:enable:no-unused-variable */
-    }
-    catch (e) {
-        thrown = true;
-        TKUnit.assert(e.message === "OwnerType should not be null or empty string.", "Invalid error message");
-    }
-
-    TKUnit.assert(thrown, "Should not create a Property with invalid owner type.");
-}
-
-export function test_NewProperty_WillThrow_If_Metadata_IsInvalid() {
-    var thrown = false;
-    var p;
-
-    try {
-        // check for undefined
-        p = new dependencyObservableModule.Property(generatePropertyName(), "testOwner", undefined);
-    }
-    catch (e) {
-        thrown = true;
-        TKUnit.assert(e.message === "Expected valid PropertyMetadata instance.", "Invalid error message");
-    }
-
-    TKUnit.assert(thrown, "Should not create a Property with undefined metadata.");
-
-    thrown = false;
-    try {
-        // check for invalid type
-        var metadata: any = {};
-        p = new dependencyObservableModule.Property(generatePropertyName(), "testOwner", metadata);
-    }
-    catch (e) {
-        thrown = true;
-        TKUnit.assert(e.message === "Expected valid PropertyMetadata instance.", "Invalid error message");
-    }
-
-    TKUnit.assert(thrown, "Should not create a Property with invalid metadata type.");
-}
-
-export function test_NewProperty_WillThrow_If_Key_AlreadyRegistered() {
-    var thrown = false;
-    try {
-        /* tslint:disable:no-unused-variable */
-        var p = new dependencyObservableModule.Property("test", "testOwner", new dependencyObservableModule.PropertyMetadata(0));
-        var p1 = new dependencyObservableModule.Property("test", "testOwner", new dependencyObservableModule.PropertyMetadata(0));
-        /* tslint:enable:no-unused-variable */
-    }
-    catch (e) {
-        thrown = true;
-        TKUnit.assert(e.message === "Property test already registered for type testOwner.", "Invalid error message");
-    }
-
-    TKUnit.assert(thrown, "Should not create a Property with invalid name.");
-}
-
-export function test_Property_Id_IsUnique() {
-    var p = new dependencyObservableModule.Property(generatePropertyName(), "testOwner", new dependencyObservableModule.PropertyMetadata(0));
-    var p1 = new dependencyObservableModule.Property(generatePropertyName(), "testOwner", new dependencyObservableModule.PropertyMetadata(0));
-
-    TKUnit.assert(p.id !== p1.id, "Property.id should be unique.");
-}
-
-export function test_PropertyMetadataSettings_HasValid_Memberes() {
-    TKUnit.assert(dependencyObservableModule.PropertyMetadataSettings.None === 0, "PropertyMetadataSettings.None not defined correctly.");
-    TKUnit.assert(dependencyObservableModule.PropertyMetadataSettings.AffectsLayout === 1, "PropertyMetadataSettings.AffectsLayout not defined correctly.");
-    TKUnit.assert(dependencyObservableModule.PropertyMetadataSettings.AffectsStyle === 2, "PropertyMetadataSettings.AffectsStyle not defined correctly.");
-    TKUnit.assert(dependencyObservableModule.PropertyMetadataSettings.Inheritable === 4, "PropertyMetadataSettings.Inheritable not defined correctly.");
-}
-
-export function test_ValueSource_HasValid_Memberes() {
-    TKUnit.assert(dependencyObservableModule.ValueSource.Default === 0, "ValueSource.None not defined correctly.");
-    TKUnit.assert(dependencyObservableModule.ValueSource.Inherited === 1, "ValueSource.Inherited not defined correctly.");
-    TKUnit.assert(dependencyObservableModule.ValueSource.Css === 2, "ValueSource.Css not defined correctly.");
-    TKUnit.assert(dependencyObservableModule.ValueSource.Local === 3, "ValueSource.Local not defined correctly.");
-    TKUnit.assert(dependencyObservableModule.ValueSource.VisualState === 4, "ValueSource.VisualState not defined correctly.");
-}
-
-export function test_PropertyMetadata_Options() {
-    var options =
-        dependencyObservableModule.PropertyMetadataSettings.AffectsLayout |
-        dependencyObservableModule.PropertyMetadataSettings.AffectsStyle |
-        dependencyObservableModule.PropertyMetadataSettings.Inheritable;
-
-    var p = new dependencyObservableModule.Property(generatePropertyName(), "testOwner", new dependencyObservableModule.PropertyMetadata(0, options));
-
-    TKUnit.assert(p.affectsLayout === true, "Property.affectsLayout not working as expected.");
-    TKUnit.assert(p.affectsStyle === true, "Property.affectsStyle not working as expected.");
-    TKUnit.assert(p.inheritable === true, "Property.inheritable not working as expected.");
-    TKUnit.assert(p.metadata.options === options, "PropertyMetadata.options not properly set.");
-}
-
-export function test_PropertyEntry_effectiveValue() {
-    var entry = new dependencyObservableModule.PropertyEntry();
-
-    // default value
-    TKUnit.assertEqual(entry.effectiveValue, undefined, "effectiveValue should be undefined.");
-    TKUnit.assertEqual(entry.valueSource, dependencyObservableModule.ValueSource.Default, "ValueSource.Default not working as expected.");
-
-    // local value
-    entry.localValue = 10;
-    entry.resetValue();
-    
-    // default value
-    TKUnit.assertEqual(entry.effectiveValue, undefined, "ValueSource.Default not working as expected.");
-    TKUnit.assertEqual(entry.valueSource, dependencyObservableModule.ValueSource.Default, "ValueSource.Default not working as expected.");
-}
-
-export function test_DependencyObservable_get_set_AreOverriden() {
-    var dO = new TestDO();
-
-    dO.test = true;
-    TKUnit.assert(dO.get("test") === true, "DependencyObservable should override Observable.get");
-
-    dO.set("test", false);
-    TKUnit.assert(<any>dO.test === false, "DependencyObservable should override Observable.set");
-}
-
-export function test_DependencyObservable_getValue_setValue() {
-    var dO = new TestDO();
-
-    // implicitly use ValueSource.Local when not specified
-    dO._setValue(testProperty1, 5);
-    TKUnit.assertEqual(dO.test1, 5, "expected true after _setValue.");
-    TKUnit.assertEqual(dO._getValueSource(testProperty1), dependencyObservableModule.ValueSource.Local, "_setValue without third parameter should use ValueSource.Local");
-
-    dO._setValue(testProperty1, 10, dependencyObservableModule.ValueSource.Inherited);
-    TKUnit.assertEqual(dO.test1, 5, "ValueSource.Local should have higher priority than Inherited.");
-
-    // revert to default value
-    dO._resetValue(testProperty1);
-    TKUnit.assertEqual(dO.test1, 10, "_resetValue should revert to inheritedValue");
-
-    // test the ValueSource parameter
-    dO._setValue(testProperty1, 10, dependencyObservableModule.ValueSource.Inherited);
-    TKUnit.assertEqual(dO.test1, 10, "_setValue with three parameters not working as expected.");
-    TKUnit.assertEqual(dO._getValueSource(testProperty1), dependencyObservableModule.ValueSource.Inherited, "expected ValueSource.Inherited");
-
-    dO._setValue(testProperty1, 20, dependencyObservableModule.ValueSource.Local);
-    TKUnit.assertEqual(dO.test1, 20, "_setValue with three parameters not working as expected.");
-    TKUnit.assertEqual(dO._getValueSource(testProperty1), dependencyObservableModule.ValueSource.Local, "expected ValueSource.Local");
-
-    // reset the Local value and verify the effectiveValue will be reverted to the Inherited one.
-    dO._resetValue(testProperty1, dependencyObservableModule.ValueSource.Local);
-    TKUnit.assertEqual(dO.test1, 10, "_resetValue for ValueSource not working as expected.");
-    TKUnit.assertEqual(dO._getValueSource(testProperty1), dependencyObservableModule.ValueSource.Inherited, "expected ValueSource.Inherited");
-}
-
-export function test_PropertyMetadata_onValueChanged_Callback_IsInvoked() {
-    currentChangeData = undefined;
-
-    var dO = new TestDO();
-    dO.test = true;
-
-    validateDOChangeData(dO, testProperty, false, true);
-
-    currentChangeData = undefined;
-    var dO1 = new TestDO();
-    dO1.test1 = 10;
-
-    validateDOChangeData(dO1, testProperty1, 0, 10);
-
-    // reset value
-    currentChangeData = undefined;
-    dO1._resetValue(testProperty1);
-    validateDOChangeData(dO1, testProperty1, 10, 0);
-
-    currentChangeData = undefined;
-    dO1._setValue(testProperty1, 10, dependencyObservableModule.ValueSource.Inherited);
-    validateDOChangeData(dO1, testProperty1, 0, 10);
-
-    currentChangeData = undefined;
-    dO1._setValue(testProperty1, 20, dependencyObservableModule.ValueSource.Local);
-    validateDOChangeData(dO1, testProperty1, 10, 20);
-
-    currentChangeData = undefined;
-    dO1._resetValue(testProperty1, dependencyObservableModule.ValueSource.Local);
-    validateDOChangeData(dO1, testProperty1, 20, 10);
-}
-
-export function test_Observable_on_propertyChange_IsRaised() {
-    var dO1 = new TestDO();
-
-    var changeData: observableModule.PropertyChangeData;
-    dO1.on(observableModule.Observable.propertyChangeEvent, function (data: observableModule.PropertyChangeData) {
-        changeData = data;
-    });
-
-    dO1.test1 = 10;
-    validateChangeData(changeData, dO1, "test1", 10);
-
-    // reset value
-    changeData = undefined;
-    dO1._resetValue(testProperty1);
-    validateChangeData(changeData, dO1, "test1", 0);
-
-    changeData = undefined;
-    dO1._setValue(testProperty1, 10, dependencyObservableModule.ValueSource.Inherited);
-    validateChangeData(changeData, dO1, "test1", 10);
-
-    changeData = undefined;
-    dO1._setValue(testProperty1, 20, dependencyObservableModule.ValueSource.Local);
-    validateChangeData(changeData, dO1, "test1", 20);
-
-    changeData = undefined;
-    dO1._resetValue(testProperty1, dependencyObservableModule.ValueSource.Local);
-    validateChangeData(changeData, dO1, "test1", 10);
-}
-
-export function test_setValue_WillThrow_If_ValueIsInvalid() {
-    var dO = new TestDO();
-
-    TKUnit.assertThrows(
-        () => {
-            dO.testWithValidation = -1;
-        },
-        "Set invalid value should throw",
-        "Invalid value -1 for property testWithValidation");
-
-}
-
-export function test_setValue_WillNotThrow_If_ValueIsValid() {
-    var dO = new TestDO();
-    // This should not throw.
-    dO.testWithValidation = 1;
-}
diff --git a/tests/app/ui/frame/frame-tests-common.ts b/tests/app/ui/frame/frame-tests-common.ts
index 3bf54dc6f..b1318f887 100644
--- a/tests/app/ui/frame/frame-tests-common.ts
+++ b/tests/app/ui/frame/frame-tests-common.ts
@@ -2,10 +2,8 @@
 import { Frame, getFrameById, topmost, NavigationEntry } from "tns-core-modules/ui/frame";
 // << frame-require
 
-import { getRootView } from "tns-core-modules/application";
 import { Label } from "tns-core-modules/ui/label";
 import { Page } from "tns-core-modules/ui/page";
-import * as helper from "../../ui-helper";
 import * as TKUnit from "../../tk-unit";
 
 const NAV_WAIT = 15;
@@ -233,8 +231,6 @@ export function test_page_parent_when_navigate_back() {
 }
 
 export function test_frame_retrieval_API_when_navigating() {
-    const rootView = getRootView();
-
     const initialFrame = new Frame();
     initialFrame.id = "initialFrame";
     initialFrame.navigate(() => new Page());
@@ -266,4 +262,4 @@ export function test_frame_retrieval_API_when_navigating() {
     // clean up the frame stack
     initialFrame._removeFromFrameStack();
     newFrame._removeFromFrameStack();
-}
\ No newline at end of file
+}
diff --git a/tests/app/ui/layouts/flexbox-layout-tests.ts b/tests/app/ui/layouts/flexbox-layout-tests.ts
index 68fdcfbea..a0e232099 100644
--- a/tests/app/ui/layouts/flexbox-layout-tests.ts
+++ b/tests/app/ui/layouts/flexbox-layout-tests.ts
@@ -654,7 +654,7 @@ export const testJustifyContent_spaceAround_flexDirection_column_withPadding = t
     ({ root, flexbox, text1, text2, text3 }) => {
         let space = height(flexbox) - height(text1) - height(text2) - height(text3) - dipToDp(padding) * 2;
         space = space / 6; // Divide by the number of children * 2
-    
+
         closeEnough(top(text1), paddingTop(flexbox) + space);
         closeEnough(bottom(text1) + 2 * space, top(text2));
         closeEnough(bottom(text2) + 2 * space, top(text3));
@@ -849,7 +849,7 @@ export const testAlignContent_spaceBetween_withPadding = test(
         isBottomAlignedWith(text3, flexbox);
         isLeftAlignedWith(text3, flexbox);
     }
-);	
+);
 
 export const testAlignContent_spaceAround = test(
     activity_align_content_test,
@@ -1523,8 +1523,8 @@ export const testMinWidth_initial_width_less_than_minWidth = test(
     noop,
     ({ root, flexbox, text1, text2, text3 }) => {
         let minWidth = 100;
-        closeEnough(width(text1), dipToDp(100));
-        closeEnough(width(text2), width(flexbox) - dipToDp(100));
+        closeEnough(width(text1), dipToDp(minWidth));
+        closeEnough(width(text2), width(flexbox) - dipToDp(minWidth));
     }
 );
 
@@ -1702,7 +1702,7 @@ let activity_wrap_parent_padding_horizontal_test = () => getViews(
     `<FlexboxLayout iosOverflowSafeArea="false" id="flexbox" width="360" verticalAlignment="top" padding="32" flexDirection="${FlexDirection.ROW}" flexWrap="${FlexWrap.WRAP}" alignItems="${AlignItems.FLEX_START}" backgroundColor="gray">
         <Label id="text1" width="280" height="80" text="1" backgroundColor="red" />
         <Label id="text2" width="30" height="80" text="2" backgroundColor="green" />
-        <Label id="text3" width="100" height="80" text="3" backgroundColor="blue" /> 
+        <Label id="text3" width="100" height="80" text="3" backgroundColor="blue" />
     </FlexboxLayout>`
 );
 
diff --git a/tests/app/ui/layouts/safe-area-tests.ts b/tests/app/ui/layouts/safe-area-tests.ts
index 1f792c9bd..360773e43 100644
--- a/tests/app/ui/layouts/safe-area-tests.ts
+++ b/tests/app/ui/layouts/safe-area-tests.ts
@@ -9,7 +9,7 @@ import { Page } from "tns-core-modules/ui/page";
 import { Label } from "tns-core-modules/ui/label";
 import {
     dipToDp, left, top, right, bottom, height, width,
-    equal, closeEnough, lessOrCloseEnough, greaterOrCloseEnough, check,
+    equal, closeEnough, lessOrCloseEnough, greaterOrCloseEnough,
     isLeftAlignedWith, isRightAlignedWith, isTopAlignedWith, isBottomAlignedWith,
     isLeftWith, isAboveWith, isRightWith, isBelowWith
 } from "./layout-tests-helper";
@@ -112,7 +112,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_in_full_screen_test(root, pageOptions);
             },
             pageOptions
@@ -147,7 +147,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBar: true }
@@ -162,7 +162,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_hidden_test(root);
             },
             { actionBarHidden: true }
@@ -177,7 +177,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBarFlat: true }
@@ -192,7 +192,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_hidden_test(root);
             },
             { tabBar: true }
@@ -207,7 +207,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBar: true, tabBar: true }
@@ -310,7 +310,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getDockViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_in_full_screen_test(root, pageOptions);
             },
             pageOptions
@@ -345,7 +345,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBar: true }
@@ -360,7 +360,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_hidden_test(root);
             },
             { actionBarHidden: true }
@@ -375,7 +375,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBarFlat: true }
@@ -390,7 +390,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_hidden_test(root);
             },
             { tabBar: true }
@@ -405,7 +405,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBar: true, tabBar: true }
@@ -563,7 +563,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBar: true }
@@ -578,7 +578,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_hidden_test(root);
             },
             { actionBarHidden: true }
@@ -593,7 +593,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBarFlat: true }
@@ -608,7 +608,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_hidden_test(root);
             },
             { tabBar: true }
@@ -623,7 +623,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBar: true, tabBar: true }
@@ -857,7 +857,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBar: true }
@@ -872,7 +872,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_hidden_test(root);
             },
             { actionBarHidden: true }
@@ -887,7 +887,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBarFlat: true }
@@ -902,7 +902,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_hidden_test(root);
             },
             { tabBar: true }
@@ -917,7 +917,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBar: true, tabBar: true }
@@ -1030,7 +1030,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
 
                 greaterOrCloseEnough(width(cells[1][0]), width(cells[1][1]), `cell10 width<${width(cells[1][0])}> not greater or close enough cell11 width<${width(cells[1][1])}>`);
                 lessOrCloseEnough(width(cells[1][1]), width(cells[1][2]), `cell11 width<${width(cells[1][1])}> not less or close enough cell12 width<${width(cells[1][2])}>`);
-                
+
                 const sumOfNestedGridWidths = width(cells[1][0]) + width(cells[1][1]) + width(cells[1][2])
                 equal(width(grid), sumOfNestedGridWidths, `grid width<${width(grid)}> sum of nested grids width <${sumOfNestedGridWidths}>`);
             },
@@ -1094,7 +1094,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBar: true }
@@ -1109,7 +1109,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_hidden_test(root);
             },
             { actionBarHidden: true }
@@ -1124,7 +1124,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBarFlat: true }
@@ -1139,7 +1139,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_hidden_test(root);
             },
             { tabBar: true }
@@ -1154,7 +1154,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBar: true, tabBar: true }
@@ -1308,7 +1308,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBar: true }
@@ -1323,7 +1323,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_hidden_test(root);
             },
             { actionBarHidden: true }
@@ -1338,7 +1338,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBarFlat: true }
@@ -1353,7 +1353,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_hidden_test(root);
             },
             { tabBar: true }
@@ -1368,7 +1368,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
         this.executeSnippet(
             this.getViews(snippet),
             this.noop,
-            ({ root }) => { 
+            ({ root }) => {
                 this.layout_insets_top_action_bar_test(root);
             },
             { actionBar: true, tabBar: true }
diff --git a/tests/app/ui/list-view/list-view-safe-area-tests.ts b/tests/app/ui/list-view/list-view-safe-area-tests.ts
index fb984a0d7..f6b55274a 100644
--- a/tests/app/ui/list-view/list-view-safe-area-tests.ts
+++ b/tests/app/ui/list-view/list-view-safe-area-tests.ts
@@ -4,12 +4,11 @@ import { parse } from "tns-core-modules/ui/builder";
 import * as view from "tns-core-modules/ui/core/view";
 import * as platform from "tns-core-modules/platform";
 import { ListView } from "tns-core-modules/ui/list-view";
-import { ios as iosUtils } from "tns-core-modules/utils/utils";
 import { ViewModel } from "./list-view-view-model";
 import { UITest } from "../../ui-test";
 import {
-    dipToDp, left, top, right, bottom, height, width,
-    equal, check, lessOrCloseEnough, greaterOrCloseEnough,
+    left, top, right, bottom, height, width,
+    equal, lessOrCloseEnough, greaterOrCloseEnough,
     isLeftAlignedWith, isRightAlignedWith, isTopAlignedWith
 } from "../layouts/layout-tests-helper";
 
diff --git a/tests/app/ui/page/modal-tab-page.ts b/tests/app/ui/page/modal-tab-page.ts
index ce7d16e61..f4334f44d 100644
--- a/tests/app/ui/page/modal-tab-page.ts
+++ b/tests/app/ui/page/modal-tab-page.ts
@@ -1,11 +1,11 @@
 import { NavigatedData } from "tns-core-modules/ui/page";
 import { View } from "tns-core-modules/ui/core/view";
 import * as TKUnit from "../../tk-unit";
-import { stack } from "tns-core-modules/ui/frame";
+import { _stack } from "tns-core-modules/ui/frame";
 import { isAndroid } from "tns-core-modules/platform";
 
 export function onNavigatedTo(args: NavigatedData) {
-    TKUnit.assertEqual(stack().length, 2, "Host and tab modal frame should be instantiated at this point!");
+    TKUnit.assertEqual(_stack().length, 2, "Host and tab modal frame should be instantiated at this point!");
     // shownModally raised after page.NavigatedTo on iOS so we close modal there
     if (isAndroid) {
         (args.object as View).closeModal();
diff --git a/tests/app/ui/page/modal-tab-root.ts b/tests/app/ui/page/modal-tab-root.ts
index c47fb1a45..0e313aa49 100644
--- a/tests/app/ui/page/modal-tab-root.ts
+++ b/tests/app/ui/page/modal-tab-root.ts
@@ -1,7 +1,7 @@
 import { ShownModallyData } from "tns-core-modules/ui/core/view";
 import { TabView } from "tns-core-modules/ui/tab-view/tab-view";
 import * as TKUnit from "../../tk-unit";
-import { stack } from "tns-core-modules/ui/frame";
+import { _stack } from "tns-core-modules/ui/frame";
 import { isIOS } from "tns-core-modules/platform"
 
 export function onShownModally(args: ShownModallyData) {
@@ -11,7 +11,7 @@ export function onShownModally(args: ShownModallyData) {
         args.context.shownModally = true;
     }
 
-    const hostFrame = stack()[0];
+    const hostFrame = _stack()[0];
     TKUnit.assertNotNull(hostFrame, "Host frame should not be null");
     TKUnit.assertEqual(hostFrame.currentPage.modal, tabView, "hostFrame.currentPage.modal should be equal to the tabView instance on tabView.shownModally event handler.");
 
@@ -19,4 +19,4 @@ export function onShownModally(args: ShownModallyData) {
     if (isIOS) {
         args.closeCallback("return value");
     }
-}
\ No newline at end of file
+}
diff --git a/tests/app/ui/page/page-tests-common.ts b/tests/app/ui/page/page-tests-common.ts
index d4f6218d9..6f402f652 100644
--- a/tests/app/ui/page/page-tests-common.ts
+++ b/tests/app/ui/page/page-tests-common.ts
@@ -18,7 +18,7 @@ import * as TKUnit from "../../tk-unit";
 import * as helper from "../../ui-helper";
 import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import { View, PercentLength, unsetValue, EventData, isIOS } from "tns-core-modules/ui/core/view";
-import { Frame, stack } from "tns-core-modules/ui/frame";
+import { Frame, _stack } from "tns-core-modules/ui/frame";
 import { Label } from "tns-core-modules/ui/label";
 import { Color } from "tns-core-modules/color";
 import { TabView, TabViewItem } from "tns-core-modules/ui/tab-view/tab-view";
@@ -96,7 +96,6 @@ export function test_NavigateToNewPage() {
     // >> article-create-navigate-to-page
 
     const topFrame = topmost();
-    const currentPage = topFrame.currentPage;
 
     let testPage: Page;
     const pageFactory = function (): Page {
@@ -197,7 +196,6 @@ function _test_PageNavigation_EventSequence(withTransition: boolean) {
 }
 
 export function test_NavigateTo_WithContext() {
-    const currentPage = topmost().currentPage;
     // >> article-pass-data
     let testPage: Page;
     const pageFactory = function (): Page {
@@ -228,7 +226,6 @@ export function test_NavigateTo_WithContext() {
 
 //https://github.com/NativeScript/NativeScript/issues/731
 export function test_NavigateTo_WithBindingContext() {
-    const currentPage = topmost().currentPage;
     let testPage: Page;
     let bindingContext;
     const pageFactory = function (): Page {
@@ -297,7 +294,7 @@ export function test_LoadPageFromDeclarativeWithCSS() {
 
 export function test_LoadPageFromModuleWithCSS() {
     const topFrame = topmost();
-    
+
     helper.navigateToModule("ui/page/test-module-css-page");
 
     TKUnit.assert(topFrame.currentPage.content instanceof Label, "Content of the test page should be a Label created within test-page-module-css.");
@@ -478,7 +475,7 @@ function _test_WhenInnerViewCallsCloseModal(closeModalGetter: (ShownModallyData)
         button.text = "CLOSE MODAL";
         modalPage.content = button;
 
-        (<Button>page.content).showModal(modalPage, {}, modalCloseCallback);
+        (<Button>page.content).showModal(modalPage, { context: {}, closeCallback: modalCloseCallback });
     }
 
     const masterPageFactory = function (): Page {
@@ -540,7 +537,12 @@ export function test_WhenViewBaseCallsShowModal_WithArguments_ShouldOpenModal()
         modalPage.id = "modalPage_test_WhenViewBaseCallsShowModal_WithArguments_ShouldOpenModal";
         modalPage.on(View.shownModallyEvent, modalPageShownModallyEventHandler);
         const tabViewItem = (<TabView>page.content).items[0];
-        tabViewItem.showModal(modalPage, {}, modalCloseCallback, false, false);
+        tabViewItem.showModal(modalPage, {
+            context: {},
+            closeCallback: modalCloseCallback,
+            fullscreen: false,
+            animated: false
+        });
     }
 
     const masterPageFactory = function (): Page {
@@ -651,10 +653,9 @@ export function test_WhenViewBaseCallsShowModal_WithoutArguments_ShouldThrow() {
         const page = <Page>args.object;
         page.off(Page.navigatedToEvent, hostNavigatedToEventHandler);
 
-        const hostPage = <Page>args.object;
         const tabViewItem = (<TabView>page.content).items[0];
         try {
-            tabViewItem.showModal();
+            (<any>tabViewItem).showModal();
         } catch (e) {
             modalThrows = true;
         }
@@ -756,7 +757,12 @@ export function test_WhenRootTabViewShownModallyItCanCloseModal() {
         tabView.items = createTabItems(2);
         tabView.on(View.shownModallyEvent, tabViewShownModallyEventHandler);
 
-        page.showModal(tabView, {}, modalCloseCallback, false, false);
+        page.showModal(tabView, {
+            context: {},
+            closeCallback: modalCloseCallback,
+            fullscreen: false,
+            animated: false
+        });
     }
 
     const masterPageFactory = function (): Page {
@@ -835,7 +841,13 @@ export function test_WhenPageIsNavigatedToItCanShowAnotherPageAsModal() {
         modalPage.on(Page.loadedEvent, onModalLoaded);
         modalPage.on(Page.unloadedEvent, onModalUnloaded);
 
-        page.showModal(modalPage, ctx, modalCloseCallback, false, false);
+        page.showModal(modalPage, {
+            context: ctx,
+            closeCallback: modalCloseCallback,
+            fullscreen: false,
+            animated: false
+        });
+
         TKUnit.assertTrue((<any>modalPage).showingModally, "showingModally");
     };
 
@@ -873,7 +885,7 @@ export function test_WhenModalPageShownHostPageNavigationEventsShouldNotBeRaised
     let ready = false;
 
     const modalCloseCallback = function (returnValue: any) {
-        TKUnit.assertEqual(stack().length, 1, "Single frame should be instantiated at this point!");
+        TKUnit.assertEqual(_stack().length, 1, "Single frame should be instantiated at this point!");
         ready = true;
     }
 
@@ -894,7 +906,7 @@ export function test_WhenModalPageShownHostPageNavigationEventsShouldNotBeRaised
     };
 
     const modalPageShownModallyEventHandler = function () {
-        TKUnit.assertEqual(stack().length, 1, "Single frame should be instantiated at this point!");
+        TKUnit.assertEqual(_stack().length, 1, "Single frame should be instantiated at this point!");
     }
 
     const hostNavigatedToEventHandler2 = function (args: NavigatedData) {
@@ -906,12 +918,17 @@ export function test_WhenModalPageShownHostPageNavigationEventsShouldNotBeRaised
             moduleName: basePath + "modal-page"
         };
 
-        TKUnit.assertEqual(stack().length, 1, "Single frame should be instantiated at this point!");
+        TKUnit.assertEqual(_stack().length, 1, "Single frame should be instantiated at this point!");
 
         const modalPage = createViewFromEntry(entry) as Page;
         modalPage.on(Frame.shownModallyEvent, modalPageShownModallyEventHandler);
 
-        page.showModal(modalPage, {}, modalCloseCallback, false, false);
+        page.showModal(modalPage, {
+            context: {},
+            closeCallback: modalCloseCallback,
+            fullscreen: false,
+            animated: false
+        });
     }
 
     const masterPageFactory = function (): Page {
@@ -1000,7 +1017,12 @@ export function test_WhenModalPageShownModalNavigationToEventsShouldBeRaised() {
         modalFrame = new Frame();
         modalFrame.on(Frame.shownModallyEvent, modalFrameShownModallyEventHandler);
 
-        page.showModal(modalFrame, {}, modalCloseCallback, false, false);
+        page.showModal(modalFrame, {
+            context: {},
+            closeCallback: modalCloseCallback,
+            fullscreen: false,
+            animated: false
+        });
     }
 
     const masterPageFactory = function (): Page {
@@ -1038,7 +1060,7 @@ export function test_WhenModalFrameShownModalEventsRaisedOnRootModalFrame() {
     let ready = false;
 
     const modalCloseCallback = function (returnValue: any) {
-        TKUnit.assertEqual(stack().length, 1, "Single frame should be instantiated at this point!");
+        TKUnit.assertEqual(_stack().length, 1, "Single frame should be instantiated at this point!");
         ready = true;
     }
 
@@ -1048,7 +1070,7 @@ export function test_WhenModalFrameShownModalEventsRaisedOnRootModalFrame() {
 
     const modalFrameShownModallyEventHandler = function (args: ShownModallyData) {
         shownModallyCount++;
-        TKUnit.assertEqual(stack().length, 2, "Host and modal frame should be instantiated at this point!");
+        TKUnit.assertEqual(_stack().length, 2, "Host and modal frame should be instantiated at this point!");
 
         args.closeCallback("return value");
     }
@@ -1066,16 +1088,21 @@ export function test_WhenModalFrameShownModalEventsRaisedOnRootModalFrame() {
 
         const modalPage = createViewFromEntry(entry) as Page;
 
-        TKUnit.assertEqual(stack().length, 1, "Single frame should be instantiated at this point!");
+        TKUnit.assertEqual(_stack().length, 1, "Single frame should be instantiated at this point!");
 
         modalFrame = new Frame();
         modalFrame.on(Frame.showingModallyEvent, modalFrameShowingModallyEventHandler);
         modalFrame.on(Frame.shownModallyEvent, modalFrameShownModallyEventHandler);
         modalFrame.navigate(() => modalPage);
 
-        TKUnit.assertEqual(stack().length, 2, "Host and modal frame should be instantiated at this point!");
+        TKUnit.assertEqual(_stack().length, 2, "Host and modal frame should be instantiated at this point!");
 
-        page.showModal(modalFrame, {}, modalCloseCallback, false, false);
+        page.showModal(modalFrame, {
+            context: {},
+            closeCallback: modalCloseCallback,
+            fullscreen: false,
+            animated: false
+        });
     }
 
     const masterPageFactory = function (): Page {
@@ -1137,7 +1164,12 @@ export function test_WhenModalPageShownShowModalEventsRaisedOnRootModalPage() {
         modalPage.on(Page.showingModallyEvent, modalPageShowingModallyEventHandler);
         modalPage.on(Page.shownModallyEvent, modalPageShownModallyEventHandler);
 
-        page.showModal(modalPage, {}, modalCloseCallback, false, false);
+        page.showModal(modalPage, {
+            context: {},
+            closeCallback: modalCloseCallback,
+            fullscreen: false,
+            animated: false
+        });
     }
 
     const masterPageFactory = function (): Page {
@@ -1171,7 +1203,7 @@ export function test_WhenModalPageShownShowModalEventsRaisedOnRootModalTabView()
     let ready = false;
 
     const modalCloseCallback = function (returnValue: any) {
-        TKUnit.assertEqual(stack().length, 1, "Single host frame should be instantiated at this point!");
+        TKUnit.assertEqual(_stack().length, 1, "Single host frame should be instantiated at this point!");
         setTimeout(() => ready = true, 50);
     }
 
@@ -1192,15 +1224,20 @@ export function test_WhenModalPageShownShowModalEventsRaisedOnRootModalTabView()
             moduleName: basePath + "modal-tab-root"
         };
 
-        TKUnit.assertEqual(stack().length, 1, "Single host frame should be instantiated at this point!");
+        TKUnit.assertEqual(_stack().length, 1, "Single host frame should be instantiated at this point!");
 
         const modalTabView = createViewFromEntry(entry) as TabView;
         modalTabView.on(TabView.showingModallyEvent, modalTabViewShowingModallyEventHandler);
         modalTabView.on(TabView.shownModallyEvent, modalTabViewShownModallyEventHandler);
 
-        TKUnit.assertEqual(stack().length, 2, "Host and tab modal frame should be instantiated at this point!");
+        TKUnit.assertEqual(_stack().length, 2, "Host and tab modal frame should be instantiated at this point!");
 
-        page.showModal(modalTabView, {}, modalCloseCallback, false, false);
+        page.showModal(modalTabView, {
+            context: {},
+            closeCallback: modalCloseCallback,
+            fullscreen: false,
+            animated: false
+        });
     }
 
     const masterPageFactory = function (): Page {
@@ -1214,11 +1251,11 @@ export function test_WhenModalPageShownShowModalEventsRaisedOnRootModalTabView()
         return masterPage;
     };
 
-    TKUnit.assertEqual(stack().length, 1, "Single host frame should be instantiated at this point!");
+    TKUnit.assertEqual(_stack().length, 1, "Single host frame should be instantiated at this point!");
 
     helper.navigate(masterPageFactory);
 
-    TKUnit.assertEqual(stack().length, 2, "Host and modal tab frame should be instantiated at this point!");
+    TKUnit.assertEqual(_stack().length, 2, "Host and modal tab frame should be instantiated at this point!");
 
     TKUnit.waitUntilReady(() => ready);
 
@@ -1227,7 +1264,7 @@ export function test_WhenModalPageShownShowModalEventsRaisedOnRootModalTabView()
         TKUnit.waitUntilReady(() => !(<UIViewController>topmost().currentPage.viewController).presentedViewController);
     }
 
-    TKUnit.assertEqual(stack().length, 1, "Single host frame should be instantiated at this point!");
+    TKUnit.assertEqual(_stack().length, 1, "Single host frame should be instantiated at this point!");
 
     TKUnit.assertTrue(showingModallyCount === 1);
     TKUnit.assertTrue(shownModallyCount === 1);
diff --git a/tests/app/ui/page/page-tests.android.ts b/tests/app/ui/page/page-tests.android.ts
index a6d2f40e7..8bc80bb31 100644
--- a/tests/app/ui/page/page-tests.android.ts
+++ b/tests/app/ui/page/page-tests.android.ts
@@ -29,17 +29,10 @@ export function test_NavigateToNewPage_WithAndroidCache() {
         return testPage;
     };
 
-    const androidFrame = topmost().android;
-    const cachingBefore = androidFrame.cachePagesOnNavigate;
-    try {
-        const currentPage = topmost().currentPage;
-        androidFrame.cachePagesOnNavigate = true;
-        helper.navigateWithHistory(pageFactory);
-        TKUnit.assertNotNull(currentPage.nativeView);
-        helper.goBack();
-    } finally {
-        androidFrame.cachePagesOnNavigate = cachingBefore;
-    }
+    const currentPage = topmost().currentPage;
+    helper.navigateWithHistory(pageFactory);
+    TKUnit.assertNotNull(currentPage.nativeView);
+    helper.goBack();
 
     TKUnit.assertNull(testPage.parent, "Page.parent should become undefined after navigating back");
     TKUnit.assertFalse(testPage.isLoaded, "Page.isLoaded should become false after navigating back");
@@ -80,18 +73,7 @@ export function test_SetPageCaching_ToTheSameValue_AfterNavigated_DoesNotThrow()
         return testPage;
     };
 
-    const androidFrame = topmost().android;
-    const cachingBefore = androidFrame.cachePagesOnNavigate;
-
     helper.navigate(pageFactory);
-
-    try {
-        // Set caching to same value.
-        androidFrame.cachePagesOnNavigate = cachingBefore;
-    }
-    finally {
-        androidFrame.cachePagesOnNavigate = cachingBefore;
-    }
 }
 
 export var test_Resolve_Fragment_ForPage = function () {
@@ -107,4 +89,4 @@ export var test_Resolve_Fragment_ForPage = function () {
 
     const fragment = frame.android.fragmentForPage(frame._currentEntry);
     TKUnit.assertNotNull(fragment, "Failed to resolve native fragment for page");
-}
\ No newline at end of file
+}
diff --git a/tests/app/ui/page/page-tests.ios.ts b/tests/app/ui/page/page-tests.ios.ts
index 26339f3a6..d0c9c470e 100644
--- a/tests/app/ui/page/page-tests.ios.ts
+++ b/tests/app/ui/page/page-tests.ios.ts
@@ -1,4 +1,4 @@
-import { Page, layout, View, EventData } from "tns-core-modules/ui/page";
+import { Page, View, EventData } from "tns-core-modules/ui/page";
 import { Label } from "tns-core-modules/ui/label";
 import { topmost } from "tns-core-modules/ui/frame";
 import * as TKUnit from "../../tk-unit";
@@ -37,8 +37,7 @@ export function test_WhenShowingModalPageUnloadedIsNotFiredForTheMasterPage() {
     }
 
     var navigatedToEventHandler = function (args) {
-        var basePath = "ui/page/";
-        modalPage = masterPage.showModal(basePath + "modal-page", null, null, false) as Page;
+        modalPage = masterPage.showModal("ui/page/modal-page", { context: null, closeCallback: null, fullscreen: false }) as Page;
         modalPage.on(Page.unloadedEvent, onModalUnloaded);
     };
 
@@ -64,15 +63,15 @@ export function test_WhenShowingModalPageUnloadedIsNotFiredForTheMasterPage() {
     masterPage.off(View.unloadedEvent, unloadedEventHandler);
 }
 
-function getHeight(view: View): number {
-    const bounds = view._getCurrentLayoutBounds();
-    return bounds.bottom - bounds.top;
-}
+// function getHeight(view: View): number {
+//     const bounds = view._getCurrentLayoutBounds();
+//     return bounds.bottom - bounds.top;
+// }
 
-function getNativeHeight(view: View): number {
-    const bounds = view.nativeViewProtected.frame;
-    return layout.toDevicePixels(bounds.size.height);
-}
+// function getNativeHeight(view: View): number {
+//     const bounds = view.nativeViewProtected.frame;
+//     return layout.toDevicePixels(bounds.size.height);
+// }
 
 // export function test_correct_layout_top_bottom_edges_does_not_span_not_scrollable_not_flat() {
 //     test_correct_layout_top_bottom_edges_does_not_span_options(false, false);
@@ -402,4 +401,4 @@ export function test_showing_native_viewcontroller_doesnt_throw_exception() {
     TKUnit.assertEqual(0, navigatingFrom, "navigatingTo");
     TKUnit.assertEqual(0, unloaded, "navigatingTo");
     TKUnit.assertEqual(0, navigatedFrom, "navigatingTo");
-}
\ No newline at end of file
+}
diff --git a/tests/app/ui/repeater/repeater-safe-area-tests.ts b/tests/app/ui/repeater/repeater-safe-area-tests.ts
index b749e54bd..6e2b3c5a8 100644
--- a/tests/app/ui/repeater/repeater-safe-area-tests.ts
+++ b/tests/app/ui/repeater/repeater-safe-area-tests.ts
@@ -4,13 +4,8 @@ import { parse } from "tns-core-modules/ui/builder";
 import * as view from "tns-core-modules/ui/core/view";
 import * as platform from "tns-core-modules/platform";
 import { Repeater } from "tns-core-modules/ui/repeater";
-import { ios as iosUtils } from "tns-core-modules/utils/utils";
 import { UITest } from "../../ui-test";
-import {
-    dipToDp, left, top, right, bottom, height, width,
-    equal, check, lessOrCloseEnough, greaterOrCloseEnough,
-    isLeftAlignedWith, isRightAlignedWith, isTopAlignedWith
-} from "../layouts/layout-tests-helper";
+import { left, top, right, bottom,  equal } from "../layouts/layout-tests-helper";
 
 export class RepeaterSafeAreaTest extends UITest<Repeater> {
 
diff --git a/tests/app/ui/root-view/reset-root-view-tests.ts b/tests/app/ui/root-view/reset-root-view-tests.ts
index b57141927..7a34b9841 100644
--- a/tests/app/ui/root-view/reset-root-view-tests.ts
+++ b/tests/app/ui/root-view/reset-root-view-tests.ts
@@ -2,7 +2,7 @@
 import * as helper from "../../ui-helper";
 import { Page } from "tns-core-modules/ui/page";
 import { isAndroid } from "tns-core-modules/platform";
-import { Frame, NavigationEntry, stack } from "tns-core-modules/ui/frame";
+import { Frame, NavigationEntry, _stack } from "tns-core-modules/ui/frame";
 import { _resetRootView, getRootView } from "tns-core-modules/application";
 import { TabView, TabViewItem } from "tns-core-modules/ui/tab-view";
 
@@ -60,7 +60,7 @@ export function test_reset_frame_to_frame() {
     helper.waitUntilNavigatedTo(testFrameRoot1.page, () => _resetRootView(testFrameRoot1.entry));
 
     const rootView1 = getRootView();
-    const frameStack1 = stack();
+    const frameStack1 = _stack();
     TKUnit.assertEqual(rootView1, testFrameRoot1.root);
     TKUnit.assertEqual(frameStack1.length, 1);
 
@@ -69,7 +69,7 @@ export function test_reset_frame_to_frame() {
     helper.waitUntilNavigatedTo(testFrameRoot2.page, () => _resetRootView(testFrameRoot2.entry));
 
     const rootView2 = getRootView();
-    const frameStack2 = stack();
+    const frameStack2 = _stack();
     TKUnit.assertEqual(rootView2, testFrameRoot2.root);
     TKUnit.assertEqual(frameStack2.length, 1);
 };
@@ -80,7 +80,7 @@ export function test_reset_frame_to_tab() {
     helper.waitUntilNavigatedTo(testFrameRoot.page, () => _resetRootView(testFrameRoot.entry));
 
     const rootView1 = getRootView();
-    const frameStack1 = stack();
+    const frameStack1 = _stack();
     TKUnit.assertEqual(rootView1, testFrameRoot.root);
     TKUnit.assertEqual(frameStack1.length, 1);
 
@@ -89,7 +89,7 @@ export function test_reset_frame_to_tab() {
     waitUntilTabViewReady(testTabRoot.page, () => _resetRootView(testTabRoot.entry));
 
     const rootView2 = getRootView();
-    const frameStack2 = stack();
+    const frameStack2 = _stack();
     TKUnit.assertEqual(rootView2, testTabRoot.root);
     TKUnit.assertEqual(frameStack2.length, 2);
 };
@@ -100,7 +100,7 @@ export function test_reset_tab_to_frame() {
     waitUntilTabViewReady(testTabRoot.page, () => _resetRootView(testTabRoot.entry));
 
     const rootView2 = getRootView();
-    const frameStack2 = stack();
+    const frameStack2 = _stack();
     TKUnit.assertEqual(rootView2, testTabRoot.root);
     TKUnit.assertEqual(frameStack2.length, 2);
 
@@ -109,7 +109,7 @@ export function test_reset_tab_to_frame() {
     helper.waitUntilNavigatedTo(testFrameRoot.page, () => _resetRootView(testFrameRoot.entry));
 
     const rootView1 = getRootView();
-    const frameStack1 = stack();
+    const frameStack1 = _stack();
     TKUnit.assertEqual(rootView1, testFrameRoot.root);
     TKUnit.assertEqual(frameStack1.length, 1);
 };
@@ -120,7 +120,7 @@ export function test_reset_tab_to_tab() {
     waitUntilTabViewReady(testTabRoot1.page, () => _resetRootView(testTabRoot1.entry));
 
     const rootView1 = getRootView();
-    const frameStack1 = stack();
+    const frameStack1 = _stack();
     TKUnit.assertEqual(rootView1, testTabRoot1.root);
     TKUnit.assertEqual(frameStack1.length, 2);
 
@@ -129,7 +129,7 @@ export function test_reset_tab_to_tab() {
     waitUntilTabViewReady(testTabRoot2.page, () => _resetRootView(testTabRoot2.entry));
 
     const rootView2 = getRootView();
-    const frameStack2 = stack();
+    const frameStack2 = _stack();
     TKUnit.assertEqual(rootView2, testTabRoot2.root);
     TKUnit.assertEqual(frameStack2.length, 2);
 };
@@ -154,4 +154,4 @@ export function tearDownModule() {
 
     _resetRootView(resetFrameRoot.entry);
     TKUnit.waitUntilReady(() => resetFrameRoot.page.isLoaded);
-}
\ No newline at end of file
+}
diff --git a/tests/app/ui/root-view/root-view-tests.ts b/tests/app/ui/root-view/root-view-tests.ts
index 522f851cf..0919f8234 100644
--- a/tests/app/ui/root-view/root-view-tests.ts
+++ b/tests/app/ui/root-view/root-view-tests.ts
@@ -1,10 +1,9 @@
 import * as TKUnit from "../../tk-unit";
 import { Page, View } from "tns-core-modules/ui/page";
-import { Frame, NavigationEntry, stack } from "tns-core-modules/ui/frame";
+import { Frame, NavigationEntry, _stack } from "tns-core-modules/ui/frame";
 import { _resetRootView, getRootView } from "tns-core-modules/application";
 import { TabView } from "tns-core-modules/ui/tab-view";
 import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
-import * as myCustomControlWithoutXml from "./mymodule/MyControl";
 import * as helper from "../../ui-helper";
 
 function createTestFrameRootEntry() {
diff --git a/tests/app/ui/scroll-view/scroll-view-safe-area-tests.ts b/tests/app/ui/scroll-view/scroll-view-safe-area-tests.ts
index d7cd402f4..063f23e44 100644
--- a/tests/app/ui/scroll-view/scroll-view-safe-area-tests.ts
+++ b/tests/app/ui/scroll-view/scroll-view-safe-area-tests.ts
@@ -4,13 +4,12 @@ import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
 import * as TKUnit from "../../tk-unit";
 import * as view from "tns-core-modules/ui/core/view";
 import * as platform from "tns-core-modules/platform";
-import { ios as iosUtils } from "tns-core-modules/utils/utils";
 
 import * as helper from "../../ui-helper";
 import { parse } from "tns-core-modules/ui/builder";
 import {
     dipToDp, left, top, right, bottom, height, width,
-    equal, check, lessOrCloseEnough, greaterOrCloseEnough,
+    equal, lessOrCloseEnough, greaterOrCloseEnough,
     isLeftAlignedWith, isRightAlignedWith, isTopAlignedWith, isBottomAlignedWith,
     isLeftWith, isRightWith, isBelowWith
 } from "../layouts/layout-tests-helper";
diff --git a/tests/app/ui/scroll-view/scroll-view-tests.ts b/tests/app/ui/scroll-view/scroll-view-tests.ts
index 346350341..3c9b3991c 100644
--- a/tests/app/ui/scroll-view/scroll-view-tests.ts
+++ b/tests/app/ui/scroll-view/scroll-view-tests.ts
@@ -3,7 +3,6 @@ import { Button } from "tns-core-modules/ui/button";
 import { Page, isIOS } from "tns-core-modules/ui/page";
 import { UITest } from "../../ui-test";
 import * as layoutHelper from "../layouts/layout-helper";
-import * as frame from "tns-core-modules/ui/frame";
 import * as helper from "../../ui-helper";
 
 // >> article-require-scrollview-module
@@ -135,7 +134,7 @@ class ScrollLayoutTest extends UITest<ScrollView> {
         TKUnit.assertEqual(this.testView.horizontalOffset, 0, "this.testView.horizontalOffset");
         this.testView.scrollToHorizontalOffset(layoutHelper.dp(100), true);
 
-        // No synchronous change. 
+        // No synchronous change.
         TKUnit.assertEqual(this.testView.horizontalOffset, 0, "this.testView.horizontalOffset");
 
         TKUnit.waitUntilReady(() => TKUnit.areClose(layoutHelper.dip(this.testView.horizontalOffset), 100, 0.9));
diff --git a/tests/app/ui/tab-view/tab-view-navigation-tests.ts b/tests/app/ui/tab-view/tab-view-navigation-tests.ts
index 69f500a3e..829468b39 100644
--- a/tests/app/ui/tab-view/tab-view-navigation-tests.ts
+++ b/tests/app/ui/tab-view/tab-view-navigation-tests.ts
@@ -4,7 +4,7 @@ import { isIOS, isAndroid } from "tns-core-modules/platform";
 import { Label } from "tns-core-modules/ui/label";
 import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import * as frameModule from "tns-core-modules/ui/frame";
-import { Page, NavigatedData } from "tns-core-modules/ui/page";
+import { Page } from "tns-core-modules/ui/page";
 import { ListView, ItemEventData } from "tns-core-modules/ui/list-view";
 import { TabView, TabViewItem } from "tns-core-modules/ui/tab-view";
 import { Button } from "tns-core-modules/ui/button";
@@ -121,12 +121,6 @@ export function testBackNavigationToTabViewWithNestedFramesShouldWork() {
 export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithAListViewTheListViewIsThere() {
     var topFrame = frameModule.topmost();
 
-    let oldChache;
-    if (topFrame.android) {
-        oldChache = topFrame.android.cachePagesOnNavigate;
-        topFrame.android.cachePagesOnNavigate = true;
-    }
-
     let tabViewPage: Page;
     let tabView: TabView;
 
@@ -173,10 +167,6 @@ export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithALis
 
     TKUnit.waitUntilReady(() => topFrame.currentPage === rootPage);
 
-    if (topFrame.android) {
-        topFrame.android.cachePagesOnNavigate = oldChache;
-    }
-
     TKUnit.assert(tabView.items[0].view instanceof ListView, "ListView should be created when navigating back to the main page.");
 }
 
@@ -277,4 +267,4 @@ function _clickTheFirstButtonInTheListViewNatively(tabView: TabView) {
         const btn = <UIButton>cell.contentView.subviews[0];
         btn.sendActionsForControlEvents(UIControlEvents.TouchUpInside);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/app/ui/tab-view/tab-view-tests-native.ios.ts b/tests/app/ui/tab-view/tab-view-tests-native.ios.ts
index 47cea99ca..5d197bd12 100644
--- a/tests/app/ui/tab-view/tab-view-tests-native.ios.ts
+++ b/tests/app/ui/tab-view/tab-view-tests-native.ios.ts
@@ -1,6 +1,4 @@
 import tabViewModule = require("tns-core-modules/ui/tab-view");
-import * as utils from "tns-core-modules/utils/utils";
-import getter = utils.ios.getter;
 
 export function getNativeTabCount(tabView: tabViewModule.TabView): number {
     if (!tabView.ios.viewControllers) {
@@ -33,4 +31,4 @@ export function getNativeFont(tabView: tabViewModule.TabView): UIFont {
 
 export function getOriginalFont(tabView: tabViewModule.TabView): UIFont {
     return tabView.style.fontInternal.getUIFont(UIFont.systemFontOfSize(10));
-}
\ No newline at end of file
+}
diff --git a/tests/app/ui/tabs/tabs-navigation-tests.ts b/tests/app/ui/tabs/tabs-navigation-tests.ts
index 32b1f573e..cf50e12dc 100644
--- a/tests/app/ui/tabs/tabs-navigation-tests.ts
+++ b/tests/app/ui/tabs/tabs-navigation-tests.ts
@@ -1,10 +1,9 @@
 import * as TKUnit from "../../tk-unit";
 import * as helper from "../../ui-helper";
-import { isIOS, isAndroid } from "tns-core-modules/platform";
 import { Label } from "tns-core-modules/ui/label";
 import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import * as frameModule from "tns-core-modules/ui/frame";
-import { Page, NavigatedData } from "tns-core-modules/ui/page";
+import { Page } from "tns-core-modules/ui/page";
 import { ListView, ItemEventData } from "tns-core-modules/ui/list-view";
 import { Tabs, TabContentItem, TabStrip, TabStripItem } from "tns-core-modules/ui/tabs";
 import { Button } from "tns-core-modules/ui/button";
@@ -134,12 +133,6 @@ export function testBackNavigationToTabViewWithNestedFramesShouldWork() {
 export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithAListViewTheListViewIsThere() {
     var topFrame = frameModule.topmost();
 
-    let oldChache;
-    if (topFrame.android) {
-        oldChache = topFrame.android.cachePagesOnNavigate;
-        topFrame.android.cachePagesOnNavigate = true;
-    }
-
     let tabViewPage: Page;
     let tabView: Tabs;
 
@@ -187,10 +180,6 @@ export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithALis
 
     TKUnit.waitUntilReady(() => topFrame.currentPage === rootPage);
 
-    if (topFrame.android) {
-        topFrame.android.cachePagesOnNavigate = oldChache;
-    }
-
     TKUnit.assert(tabView.items[0].view instanceof ListView, "ListView should be created when navigating back to the main page.");
 }
 
diff --git a/tests/app/ui/tabs/tabs-root-tests.ts b/tests/app/ui/tabs/tabs-root-tests.ts
index de8ba5d4d..594f4622b 100644
--- a/tests/app/ui/tabs/tabs-root-tests.ts
+++ b/tests/app/ui/tabs/tabs-root-tests.ts
@@ -1,9 +1,7 @@
 import * as TKUnit from "../../tk-unit";
-import { isAndroid } from "tns-core-modules/platform";
 import { _resetRootView } from "tns-core-modules/application/";
 import { Frame, NavigationEntry, topmost } from "tns-core-modules/ui/frame";
 import { Page } from "tns-core-modules/ui/page";
-// import { TabView, TabViewItem } from "tns-core-modules/ui/tab-view";
 import { Tabs, TabContentItem, TabStrip, TabStripItem } from "tns-core-modules/ui/tabs";
 
 function waitUntilNavigatedToMaxTimeout(pages: Page[], action: Function) {
@@ -19,16 +17,6 @@ function waitUntilNavigatedToMaxTimeout(pages: Page[], action: Function) {
     TKUnit.waitUntilReady(() => completed === pages.length, maxTimeout);
 }
 
-function waitUntilTabViewReady(page: Page, action: Function) {
-    action();
-
-    if (isAndroid) {
-        TKUnit.waitUntilReady(() => page.frame._currentEntry.fragment.isAdded());
-    } else {
-        TKUnit.waitUntilReady(() => page.isLoaded);
-    }
-}
-
 function createPage(i: number) {
     const page = new Page();
     page.id = `Tab${i} Frame${i} Page${i}`;
diff --git a/tests/app/ui/tabs/tabs-tests.ts b/tests/app/ui/tabs/tabs-tests.ts
index 4395ef355..4170c6027 100644
--- a/tests/app/ui/tabs/tabs-tests.ts
+++ b/tests/app/ui/tabs/tabs-tests.ts
@@ -1,6 +1,5 @@
 import { UITest } from "../../ui-test";
 import { Label } from "tns-core-modules/ui/label";
-import { unsetValue } from "tns-core-modules/ui/core/view";
 import * as TKUnit from "../../tk-unit";
 import * as helper from "../../ui-helper";
 import * as tabViewTestsNative from "./tabs-tests-native";
diff --git a/tests/app/ui/view/view-tests-common.ts b/tests/app/ui/view/view-tests-common.ts
index feb76a1d0..ec91d359f 100644
--- a/tests/app/ui/view/view-tests-common.ts
+++ b/tests/app/ui/view/view-tests-common.ts
@@ -12,7 +12,7 @@ import * as helper from "../../ui-helper";
 import * as observable from "tns-core-modules/data/observable";
 import * as bindable from "tns-core-modules/ui/core/bindable";
 import * as definition from "./view-tests";
-import { isIOS, isAndroid } from "tns-core-modules/platform";
+import { isAndroid } from "tns-core-modules/platform";
 import { LayoutBase } from "tns-core-modules/ui/layouts/layout-base";
 
 export function test_eachDescendant() {
@@ -470,10 +470,10 @@ export function test_NativeSetter_called_only_once_with_cssValue() {
     const testView = new TestView("view");
     testView.id = "myID";
     const pageCSS = `
-    #myID { 
-        custom: testViewValue; 
-        custom-css-property: testCssValue; 
-        custom-css-animation-property: testCssAnimValue; 
+    #myID {
+        custom: testViewValue;
+        custom-css-property: testCssValue;
+        custom-css-animation-property: testCssAnimValue;
     }`;
 
     helper.buildUIAndRunTest(testView, () => {
@@ -494,10 +494,10 @@ export function test_NativeSetter_called_only_once_with_cssValue_and_localValue(
     testView.customCssAnimationProperty = "testCssAnimationValueLocal";
     testView.custom = "testViewValueLocal";
     const pageCSS = `
-    #myID { 
-        custom-css-property: testCssValueCSS; 
-        custom: testViewValueCSS; 
-        custom-css-animation-property: testCssAnimValueCSS;         
+    #myID {
+        custom-css-property: testCssValueCSS;
+        custom: testViewValueCSS;
+        custom-css-animation-property: testCssAnimValueCSS;
     }`;
 
     helper.buildUIAndRunTest(testView, () => {
@@ -1071,4 +1071,4 @@ export function test_shorthand_property_doesnt_cache() {
     view.customShortHand = "left,right";
     TKUnit.assertEqual(view.customCssA, "left", "Expected customCssA to be 'left' the second time.");
     TKUnit.assertEqual(view.customCssB, "right", "Expected customCssA to be 'right' the second time.");
-}
\ No newline at end of file
+}
diff --git a/tests/app/ui/view/view-tests-layout-event.ts b/tests/app/ui/view/view-tests-layout-event.ts
index fcfb1de26..aeb53b6b1 100644
--- a/tests/app/ui/view/view-tests-layout-event.ts
+++ b/tests/app/ui/view/view-tests-layout-event.ts
@@ -1,11 +1,8 @@
-import * as commonTests from "./view-tests-common";
-
 import { View } from "tns-core-modules/ui/core/view";
 import { Button } from "tns-core-modules/ui/button";
 import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout/stack-layout";
 import * as helper from "../../ui-helper";
 import * as TKUnit from "../../tk-unit";
-import * as utils from "tns-core-modules/utils/utils";
 
 export function test_event_LayoutChanged_GetActualSize() {
     const test = function (views: Array<View>) {
@@ -25,7 +22,6 @@ export function test_event_LayoutChanged_GetActualSize() {
 
 export function test_event_LayoutChanged_Listeners() {
     const test = function (views: Array<View>) {
-        let stackLayoutChanged = false;
         let buttonLayoutChanged = false;
 
         views[1].on(View.layoutChangedEvent, (data) => {
diff --git a/tests/app/ui/view/view-tests.android.ts b/tests/app/ui/view/view-tests.android.ts
index b3696ccd6..624136b86 100644
--- a/tests/app/ui/view/view-tests.android.ts
+++ b/tests/app/ui/view/view-tests.android.ts
@@ -5,7 +5,6 @@ import { Button } from "tns-core-modules/ui/button";
 import * as types from "tns-core-modules/utils/types";
 import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import { Label } from "tns-core-modules/ui/label";
-import * as frame from "tns-core-modules/ui/frame";
 import * as trace from "tns-core-modules/trace";
 import { Color } from "tns-core-modules/color";
 // enable the trace, it is disabled by default
@@ -293,12 +292,3 @@ export function checkNativeBackgroundImage(v: View): boolean {
     const bkg = <org.nativescript.widgets.BorderDrawable>(<android.view.View>v.android).getBackground();
     return bkg && !types.isNullOrUndefined(bkg.getBackgroundImage());
 }
-
-let SDK: number;
-function getSDK() {
-    if (!SDK) {
-        SDK = android.os.Build.VERSION.SDK_INT;
-    }
-
-    return SDK;
-}
diff --git a/tests/app/ui/web-view/web-view-safe-area-tests.ts b/tests/app/ui/web-view/web-view-safe-area-tests.ts
index 17c102f50..2aa078496 100644
--- a/tests/app/ui/web-view/web-view-safe-area-tests.ts
+++ b/tests/app/ui/web-view/web-view-safe-area-tests.ts
@@ -4,13 +4,8 @@ import { parse } from "tns-core-modules/ui/builder";
 import * as view from "tns-core-modules/ui/core/view";
 import * as platform from "tns-core-modules/platform";
 import { WebView } from "tns-core-modules/ui/web-view";
-import { ios as iosUtils } from "tns-core-modules/utils/utils";
 import { UITest } from "../../ui-test";
-import {
-    dipToDp, left, top, right, bottom, height, width,
-    equal, check, lessOrCloseEnough, greaterOrCloseEnough,
-    isLeftAlignedWith, isRightAlignedWith, isTopAlignedWith
-} from "../layouts/layout-tests-helper";
+import { left, top, right, bottom, equal } from "../layouts/layout-tests-helper";
 
 export class WebViewSafeAreaTest extends UITest<WebView> {
 
diff --git a/tests/app/xml-declaration/app.ts b/tests/app/xml-declaration/app.ts
deleted file mode 100644
index 9a4ec6c92..000000000
--- a/tests/app/xml-declaration/app.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import * as application from "tns-core-modules/application";
-application.start({ moduleName: "xml-declaration/mainPage" });
diff --git a/tests/app/xml-declaration/xml-declaration-tests.ts b/tests/app/xml-declaration/xml-declaration-tests.ts
index 1040c9734..7a59ad97b 100644
--- a/tests/app/xml-declaration/xml-declaration-tests.ts
+++ b/tests/app/xml-declaration/xml-declaration-tests.ts
@@ -8,7 +8,6 @@ import * as textFieldModule from "tns-core-modules/ui/text-field";
 import * as gridLayoutModule from "tns-core-modules/ui/layouts/grid-layout";
 import * as absoluteLayoutModule from "tns-core-modules/ui/layouts/absolute-layout";
 import * as types from "tns-core-modules/utils/types";
-import * as fs from "tns-core-modules/file-system";
 import * as observable from "tns-core-modules/data/observable";
 import * as stackLayoutModule from "tns-core-modules/ui/layouts/stack-layout";
 import { Label } from "tns-core-modules/ui/label";
@@ -17,7 +16,6 @@ import { Button } from "tns-core-modules/ui/button";
 import { TabView } from "tns-core-modules/ui/tab-view";
 import { Observable } from "tns-core-modules/data/observable";
 import { TemplateView } from "./template-builder-tests/template-view";
-import * as myCustomControlWithoutXml from "./mymodule/MyControl";
 import * as listViewModule from "tns-core-modules/ui/list-view";
 import * as helper from "../ui-helper";
 import * as viewModule from "tns-core-modules/ui/core/view";
diff --git a/tns-core-modules/application/application.android.ts b/tns-core-modules/application/application.android.ts
index e34ae1da5..0aacae493 100644
--- a/tns-core-modules/application/application.android.ts
+++ b/tns-core-modules/application/application.android.ts
@@ -5,7 +5,7 @@
 } from ".";
 
 import {
-    notify, hasListeners, lowMemoryEvent, orientationChangedEvent, suspendEvent, resumeEvent, displayedEvent,
+    notify, hasListeners, lowMemoryEvent, orientationChangedEvent, suspendEvent, displayedEvent,
     setApplication, livesync, Observable
 } from "./application-common";
 import { profile } from "../profiling";
@@ -50,11 +50,6 @@ export class AndroidApplication extends Observable implements AndroidApplication
     // we are using these property to store the callbacks to avoid early GC collection which would trigger MarkReachableObjects
     private callbacks: any = {};
 
-    public get currentContext(): android.content.Context {
-        console.log("application.currentContext is deprecated; use startActivity, foregroundActivity, or context instead");
-        return this.foregroundActivity;
-    }
-
     public init(nativeApp: android.app.Application) {
         if (this.nativeApp === nativeApp) {
             return;
@@ -132,10 +127,9 @@ setApplication(androidApp);
 
 let mainEntry: NavigationEntry;
 let started = false;
-// NOTE: for backwards compatibility. Remove for 4.0.0.
 const createRootFrame = { value: true };
 
-function _start(entry?: NavigationEntry | string) {
+export function _start(entry?: NavigationEntry | string) {
     if (started) {
         throw new Error("Application is already started.");
     }
@@ -148,18 +142,13 @@ function _start(entry?: NavigationEntry | string) {
     }
 }
 
-export function start(entry?: NavigationEntry | string) {
-    console.log("application.start() is deprecated; use application.run() instead");
-    _start(entry);
-}
+export function _shouldCreateRootFrame(): boolean {	
+    return createRootFrame.value;	
+}	
 
-export function shouldCreateRootFrame(): boolean {
-    return createRootFrame.value;
-}
-
-export function run(entry?: NavigationEntry | string) {
-    createRootFrame.value = false;
-    _start(entry);
+ export function run(entry?: NavigationEntry | string) {	
+    createRootFrame.value = false;	
+    _start(entry);	
 }
 
 const CALLBACKS = "_callbacks";
diff --git a/tns-core-modules/application/application.d.ts b/tns-core-modules/application/application.d.ts
index 6d391a7b9..57ad15ac0 100644
--- a/tns-core-modules/application/application.d.ts
+++ b/tns-core-modules/application/application.d.ts
@@ -185,13 +185,6 @@ export function on(event: "livesync", callback: (args: EventData) => void);
  */
 export function off(eventNames: string, callback?: any, thisArg?: any);
 
-/**
- * @deprecated use application.run() instead.
- *
- * Call this method to start the application. Important: All code after this method call will not be executed!
- */
-export function start(entry?: NavigationEntry | string);
-
 /**
  * Call this method to run the application. Important: All code after this method call will not be executed!
  * Compared to start this method won't create Frame as root view.
@@ -204,12 +197,15 @@ export function run(entry?: NavigationEntry | string);
  */
 export function _resetRootView(entry?: NavigationEntry | string);
 
-//@private
-/**
- * Internal method use to check if a root Frame should be automatically created as root view.
- * @private
- */
-export function shouldCreateRootFrame(): boolean;
+//@private	
+/**		
+ * @private	
+ */	
+export function _shouldCreateRootFrame(): boolean;
+/**		
+ * @private	
+ */	
+export function _start(entry?: NavigationEntry | string);
 //@endprivate
 
 /**
@@ -410,11 +406,6 @@ export class AndroidApplication extends Observable {
      */
     foregroundActivity: any /* androidx.appcompat.app.AppCompatActivity */;
 
-    /**
-     * @deprecated use startActivity, foregroundActivity or context instead
-     */
-    currentContext: any /* android.content.Context */;
-
     /**
      * The main (start) Activity for the application.
      */
diff --git a/tns-core-modules/application/application.ios.ts b/tns-core-modules/application/application.ios.ts
index e76945a50..1e559e295 100644
--- a/tns-core-modules/application/application.ios.ts
+++ b/tns-core-modules/application/application.ios.ts
@@ -310,7 +310,7 @@ export function getRootView() {
 // NOTE: for backwards compatibility. Remove for 4.0.0.
 const createRootFrame = { value: true };
 let started: boolean = false;
-function _start(entry?: string | NavigationEntry) {
+export function _start(entry?: string | NavigationEntry) {
     mainEntry = typeof entry === "string" ? { moduleName: entry } : entry;
     started = true;
 
@@ -342,11 +342,6 @@ function _start(entry?: string | NavigationEntry) {
     }
 }
 
-export function start(entry?: string | NavigationEntry) {
-    console.log("application.start() is deprecated; use application.run() instead");
-    _start(entry);
-}
-
 export function run(entry?: string | NavigationEntry) {
     createRootFrame.value = false;
     _start(entry);
diff --git a/tns-core-modules/fps-meter/fps-native.ios.ts b/tns-core-modules/fps-meter/fps-native.ios.ts
index 2b631d93b..22dcf0249 100644
--- a/tns-core-modules/fps-meter/fps-native.ios.ts
+++ b/tns-core-modules/fps-meter/fps-native.ios.ts
@@ -1,7 +1,5 @@
 import * as definition from "./fps-native";
 
-import * as utils from "../utils/utils";
-
 class FrameHandlerImpl extends NSObject {
 
     private _owner: WeakRef<FPSCallback>;
diff --git a/tns-core-modules/image-source/image-source.d.ts b/tns-core-modules/image-source/image-source.d.ts
index dce921019..5d50e203b 100644
--- a/tns-core-modules/image-source/image-source.d.ts
+++ b/tns-core-modules/image-source/image-source.d.ts
@@ -148,8 +148,6 @@ export function fromBase64(source: string): ImageSource;
 export function fromNativeSource(source: any): ImageSource;
 
 /**
- * @deprecated use http.getImage(url: string) instead
- * 
  * Downloads the image from the provided Url and creates a new ImageSource instance from it.
  * @param url The link to the remote image object. This operation will download and decode the image.
  */
diff --git a/tns-core-modules/platform/platform.ios.ts b/tns-core-modules/platform/platform.ios.ts
index d2ebb07e4..1eaaf9ea6 100644
--- a/tns-core-modules/platform/platform.ios.ts
+++ b/tns-core-modules/platform/platform.ios.ts
@@ -1,8 +1,6 @@
 /* tslint:disable:class-name */
 import { Device as DeviceDefinition, ScreenMetrics as ScreenMetricsDefinition } from ".";
 
-import * as utils from "../utils/utils";
-
 export module platformNames {
     export const android = "Android";
     export const ios = "iOS";
diff --git a/tns-core-modules/timer/timer.ios.ts b/tns-core-modules/timer/timer.ios.ts
index 88dbb036f..0c61a7f45 100644
--- a/tns-core-modules/timer/timer.ios.ts
+++ b/tns-core-modules/timer/timer.ios.ts
@@ -1,6 +1,4 @@
-import * as utils from "../utils/utils";
-
-//iOS specific timer functions implementation.
+//iOS specific timer functions implementation.
 const timeoutCallbacks = new Map<number, KeyValuePair<NSTimer, TimerTargetImpl>>();
 let timerId = 0;
 
diff --git a/tns-core-modules/ui/bottom-navigation/bottom-navigation.android.ts b/tns-core-modules/ui/bottom-navigation/bottom-navigation.android.ts
index 28377e2e3..4abf1d09f 100644
--- a/tns-core-modules/ui/bottom-navigation/bottom-navigation.android.ts
+++ b/tns-core-modules/ui/bottom-navigation/bottom-navigation.android.ts
@@ -110,6 +110,7 @@ function createTabItemSpec(item: TabContentItem, tabStripItem: TabStripItem): or
             const is = fromFileOrResource(tabStripItem.iconSource);
             if (is) {
                 // TODO: Make this native call that accepts string so that we don't load Bitmap in JS.
+                // tslint:disable-next-line:deprecation
                 result.iconDrawable = new android.graphics.drawable.BitmapDrawable(is.android);
             } else {
                 // TODO: 
@@ -355,7 +356,7 @@ export class BottomNavigation extends TabNavigationBase {
     }
 
     [selectedIndexProperty.setNative](value: number) {
-        const smoothScroll = false;
+        // const smoothScroll = false;
 
         // if (traceEnabled()) {
         //     traceWrite("TabView this._viewPager.setCurrentItem(" + value + ", " + smoothScroll + ");", traceCategory);
diff --git a/tns-core-modules/ui/bottom-navigation/bottom-navigation.ios.ts b/tns-core-modules/ui/bottom-navigation/bottom-navigation.ios.ts
index 2bef8851b..7c6acc015 100644
--- a/tns-core-modules/ui/bottom-navigation/bottom-navigation.ios.ts
+++ b/tns-core-modules/ui/bottom-navigation/bottom-navigation.ios.ts
@@ -431,17 +431,17 @@ export class BottomNavigation extends TabNavigationBase {
         return image;
     }
 
-    private _updateIOSTabBarColorsAndFonts(): void {
-        if (!this.tabStrip || !this.tabStrip.items || !this.tabStrip.items.length) {
-            return;
-        }
+    // private _updateIOSTabBarColorsAndFonts(): void {
+    //     if (!this.tabStrip || !this.tabStrip.items || !this.tabStrip.items.length) {
+    //         return;
+    //     }
 
-        const tabBar = <UITabBar>this.ios.tabBar;
-        const states = getTitleAttributesForStates(this);
-        for (let i = 0; i < tabBar.items.count; i++) {
-            applyStatesToItem(tabBar.items[i], states);
-        }
-    }
+    //     const tabBar = <UITabBar>this.ios.tabBar;
+    //     const states = getTitleAttributesForStates(this);
+    //     for (let i = 0; i < tabBar.items.count; i++) {
+    //         applyStatesToItem(tabBar.items[i], states);
+    //     }
+    // }
 
     // TODO: Move this to TabStripItem
     // [fontInternalProperty.getDefault](): Font {
diff --git a/tns-core-modules/ui/builder/builder.d.ts b/tns-core-modules/ui/builder/builder.d.ts
index 4a2f2cc31..f70c06a2d 100644
--- a/tns-core-modules/ui/builder/builder.d.ts
+++ b/tns-core-modules/ui/builder/builder.d.ts
@@ -6,18 +6,21 @@ import { View, Template, KeyedTemplate } from "../core/view";
 import { Page } from "../page";
 import { NavigationEntry } from "../frame";
 
+//@private
 /**
- * @deprecated use createViewFromEntry instead
- * 
- * @param moduleNamePath 
- * @param fileName 
- * @param moduleExports 
+ * @private
  */
-export function loadPage(moduleNamePath: string, fileName: string, moduleExports?: any): Page;
+export function _loadPage(moduleNamePath: string, fileName: string, moduleExports?: any): Page;
+//@endprivate
+
 export function createViewFromEntry(entry: NavigationEntry): View;
+
 export function load(fileName: string, exports?: any): View;
+
 export function load(options: LoadOptions): View;
+
 export function parse(value: string | Template, exports?: any): View;
+
 export function parseMultipleTemplates(value: string, exports?: any): Array<KeyedTemplate>;
 
 export interface LoadOptions {
diff --git a/tns-core-modules/ui/builder/builder.ts b/tns-core-modules/ui/builder/builder.ts
index 819715340..f0e5ab096 100644
--- a/tns-core-modules/ui/builder/builder.ts
+++ b/tns-core-modules/ui/builder/builder.ts
@@ -57,7 +57,7 @@ export function load(pathOrOptions: string | LoadOptions, context?: any): View {
     return componentModule && componentModule.component;
 }
 
-export function loadPage(moduleNamePath: string, fileName: string, context?: any): View {
+export function _loadPage(moduleNamePath: string, fileName: string, context?: any): View {
     const componentModule = loadInternal(fileName, context, moduleNamePath);
     const componentView = componentModule && componentModule.component;
     if (componentView && moduleNamePath) {
@@ -91,7 +91,7 @@ const viewFromBuilder = profile("viewFromBuilder", (moduleNamePath: string, modu
     //     page["isBiOrientational"] = true;
     // };
 
-    return loadPage(moduleNamePath, fileName, moduleExports);
+    return _loadPage(moduleNamePath, fileName, moduleExports);
 })
 
 export const createViewFromEntry = profile("createViewFromEntry", (entry: ViewEntry): View => {
diff --git a/tns-core-modules/ui/core/dependency-observable/dependency-observable.d.ts b/tns-core-modules/ui/core/dependency-observable/dependency-observable.d.ts
deleted file mode 100644
index d31aaae77..000000000
--- a/tns-core-modules/ui/core/dependency-observable/dependency-observable.d.ts
+++ /dev/null
@@ -1,293 +0,0 @@
-/**
- * Contains the DependencyObservable class, which represents an extended Observable object that uses Property instances for value backing mechanism.
- * @module "ui/core/dependency-observable"
- */ /** */
-
-import { Observable, EventData } from "../../../data/observable";
-
-/**
- * @deprecated
- */
-export interface NativeValueResult {
-    result: any;
-    cacheable: boolean;
-}
-
-/**
- * @deprecated use 'ui/core/properties' module instead.
- */
-export class Property {
-
-    /**
-     * Creates a new Property instance.
-     * @param name The name of the property.
-     * @param ownerType The name of class that registers this property.
-     * @param metadata The PropertyMetadata object associated with this property.
-     * @param valueConverter A function that can create an instance of the property type given a string. Used when parsing CSS and XML attribute values which are strings.
-     */
-    constructor(name: string, ownerType: string, metadata: PropertyMetadata, valueConverter?: (value: string) => any);
-
-    /**
-     * Gets the name of the property. This is a read-only property.
-     */
-    name: string;
-
-    /**
-     * Gets the id of the property. This is used for fast lookup. This is a read-only property.
-     */
-    id: number;
-
-    /**
-     * Gets the PropertyMetadata object associated with the property. This is a read-only property.
-     */
-    metadata: PropertyMetadata;
-
-    /**
-     * Gets the valueConverter function associated with the property. This is a read-only property.
-     */
-    valueConverter: (value: string) => any
-
-    /**
-     * Gets or sets the defaultValueGetter function used to get the default value for this property.
-     * If default value is 'undefined' and this property is set this function will be used to extract the default value from the native instance.
-     */
-    defaultValueGetter: (instance: DependencyObservable) => NativeValueResult;
-
-    defaultValue: any;
-    onValueChanged: PropertyChangedCallback;
-    onValidateValue: PropertyValidationCallback;
-    equalityComparer: PropertyEqualityComparer;
-    affectsLayout: boolean;
-    inheritable: boolean;
-    affectsStyle: boolean;
-}
-
-/**
- * @deprecated use 'ui/core/properties' module instead.
- */
-export class PropertyMetadata {
-    /**
-     * Creates a new PropertyMetadata instance.
-     * @param defaultValue The default value for the property. E.g. 0 for a numeric property.
-     * @param options An optional parameter that specifies how the associated property should be processed by the visual tree. Valid values are one or more bitwise combinations from the PropertyMetadataSettings module.
-     * @param onChanged An optional callback that will be raised whenever the associated property changes for any DependencyObservable instance that uses the property to store a value.
-     * @param onValidateValue An optional callback that will be raised prior to a change of the associated property for any DependencyObservable instance that uses the property.
-     * @param equalityComparer An optional function that used to compare if two property values are equal.
-     */
-    constructor(
-        defaultValue: any,
-        options?: number,
-        onChanged?: PropertyChangedCallback,
-        onValidateValue?: PropertyValidationCallback,
-        equalityComparer?: PropertyEqualityComparer);
-
-    /**
-     * Gets the options parameter passed to the constructor of this instance. This is a read-only property.
-     */
-    options: number;
-    /**
-     * Gets the default value parameter passed to the constructor of this instance. This is a read-only property.
-     */
-    defaultValue: any;
-    /**
-     * Gets or sets the callback to be raised whenever the associated property changes for any DependencyObservable instance that uses the property to store a value.
-     */
-    onValueChanged: PropertyChangedCallback;
-    /**
-     * Gets or sets the callback to be raised whenever the associated property is about to change for any DependencyObservable instance that uses the property to store a value.
-     */
-    onValidateValue: PropertyValidationCallback;
-    /**
-     * Gets function that used to compare if two property values are equal.
-     */
-    equalityComparer: PropertyEqualityComparer;
-    /**
-     * Checks whether the PropertyMetadataSettings.affectsLayout bit is present in the options value.
-     */
-    affectsLayout: boolean;
-    /**
-     * Checks whether the PropertyMetadataSettings.Inheritable bit is present in the options value.
-     */
-    inheritable: boolean;
-    /**
-     * Checks whether the PropertyMetadataSettings.AffectsStyle bit is present in the options value.
-     */
-    affectsStyle: boolean;
-}
-
-/**
- * @deprecated use 'ui/core/properties' module instead.
- */
-export interface PropertyChangeData extends EventData {
-    /**
-     * The Property associated with the change.
-     */
-    property: Property;
-    /**
-     * The old property value.
-     */
-    oldValue: any;
-    /**
-     * The new property value.
-     */
-    newValue: any;
-}
-
-/**
- * @deprecated use 'ui/core/properties' module instead.
- */
-export interface PropertyChangedCallback {
-    (data: PropertyChangeData): void;
-}
-
-/**
- * @deprecated use 'ui/core/properties' module instead.
- */
-export interface PropertyValidationCallback {
-    (value: any): boolean;
-}
-
-/**
- * @deprecated use 'ui/core/properties' module instead.
- */
-export interface PropertyEqualityComparer {
-    (x: any, y: any): boolean;
-}
-
-/**
- * @deprecated
- */
-export class PropertyEntry {
-    /**
-     * Resets effective value and all the modifiers available for this entry.
-     */
-    resetValue(): void;
-
-    /**
-     * Gets the effective value of this entry.
-     * The value is composed depending on the current valueSource value, using the following priority:
-     *     1. VisualState
-     *     2. Local
-     *     3. Css
-     *     4. Inherited
-     *     5. Default
-     */
-    effectiveValue: any;
-    /**
-     * Gets the source of the current effective value for this entry. The available options for this property are defined in the ValueSource namespace.
-     */
-    valueSource: number;
-    /**
-     * Gets or sets the local value for this entry. This will trigger re-evaluation of the current effective value.
-     */
-    localValue: any;
-    /**
-     * Gets or sets the inherited value for this entry. This will trigger re-evaluation of the current effective value.
-     */
-    inheritedValue: any;
-    /**
-     * Gets or sets the css value for this entry. This will trigger re-evaluation of the current effective value.
-     */
-    cssValue: any;
-    /**
-     * Gets or sets the visual-state value for this entry. This will trigger re-evaluation of the current effective value.
-     */
-    visualStateValue: any;
-}
-
-/**
- * @deprecated use 'ui/core/view' as base class.
- */
-export class DependencyObservable extends Observable {
-    // TODO: Do we want to expose the get/setValue methods as public?
-    /**
-     * Gets a value for the property.
-     * @param property - A dependency property to retrieve a value for.
-     */
-    _getValue(property: Property): any;
-
-    /**
-     * Gets the value source (local, inherited) of a property.
-     * @param property - A dependency property to retrieve a value source for.
-     */
-    _getValueSource(property: Property): number;
-
-    /**
-     * Sets a value for a property.
-     * @param property - A dependency property to set.
-     * @param value - The new value.
-     * @param source(optional) - The value source (default is local).
-     */
-    _setValue(property: Property, value: any, source?: number): void;
-
-    /**
-     * Resets a value for a property.
-     * @param - property - A dependency property to reset.
-     * @param source(optional) - The value source (default is local).
-     */
-    _resetValue(property: Property, source?: number): void;
-
-    /**
-     * Handler for property changed event.
-     * @param property - A dependency property indentifier.
-     * @param oldValue - The old value of the property.
-     * @param newValue - The new value of the property.
-     */
-    _onPropertyChanged(property: Property, oldValue: any, newValue: any): void;
-
-    /**
-     * Iterates all the properties which have a PropertyEntry registered for this instance.
-     */
-    _resetValues(valueSource: number): void;
-    _eachSetProperty(callback: (property: Property) => boolean): void;
-    _eachSetPropertyValue(callback: (property: Property, value: any) => boolean): void;
-    //@endprivate
-}
-
-/**
- * @deprecated use 'ui/core/properties' module instead.
- */
-export module PropertyMetadataSettings {
-    /**
-     * No options are specified. This is the default value.
-     */
-    export const None: number;
-    /**
-     * A change in the Property associated with the metadata will invalidate the layout.
-     */
-    export const AffectsLayout;
-    /**
-     * The Property associated with the metadata is inheritable and its value should be propagated down in the visual tree.
-     */
-    export const Inheritable: number;
-    /**
-     * A change in the Property associated with the metadata will cause all CSS styles to be re-evaluated for for owning element.
-     */
-    export const AffectsStyle: number;
-}
-
-/**
- * @deprecated
- */
-export module ValueSource {
-    /**
-     * Default value, coming from the PropertyMetadata.defaultValue.
-     */
-    export const Default: number;
-    /**
-     * Inherited value, coming from the logical parent of the current DependencyObservable instance.
-     */
-    export const Inherited: number;
-    /**
-     * Css value, coming a css selector and rule that matches the current DependencyObservable instance.
-     */
-    export const Css: number;
-    /**
-     * Local value, set directly to the current DependencyObservable instance.
-     */
-    export const Local: number;
-    /**
-     * VisualState value, coming from a visual-state css selector. E.g. { button:pressed }.
-     */
-    export const VisualState: number;
-}
diff --git a/tns-core-modules/ui/core/dependency-observable/dependency-observable.ts b/tns-core-modules/ui/core/dependency-observable/dependency-observable.ts
deleted file mode 100644
index 9cbd2c15a..000000000
--- a/tns-core-modules/ui/core/dependency-observable/dependency-observable.ts
+++ /dev/null
@@ -1,415 +0,0 @@
-import {
-    PropertyMetadata as PropertyMetadataDefinition, Property as PropertyDefinition, PropertyEntry as PropertyEntryDefinition,
-    DependencyObservable as DependencyObservableDefinition, NativeValueResult,
-    PropertyChangedCallback, PropertyValidationCallback, PropertyEqualityComparer
-} from ".";
-import { Observable, WrappedValue } from "../../../data/observable";
-import { getClassInfo, isString } from "../../../utils/types";
-
-import { unsetValue } from "../properties";
-
-// use private variables in the scope of the module rather than static members of the class since a member is still accessible through JavaScript and may be changed.
-const propertyFromKey = {};
-
-function generatePropertyKey(name: string, ownerType: string, validate?: boolean) {
-    if (validate) {
-        validateRegisterParameters(name, ownerType);
-    }
-    return ownerType + "." + name;
-}
-
-function validateRegisterParameters(name: string, ownerType: string) {
-    if (name == null || name.trim().length === 0) {
-        throw new Error("Name should not be null or empty string.");
-    }
-
-    if (ownerType == null || ownerType.trim().length === 0) {
-        throw new Error("OwnerType should not be null or empty string.");
-    }
-}
-
-function getPropertyByNameAndType(name: string, owner: any): Property {
-    let result;
-    let key;
-    let classInfo = getClassInfo(owner);
-    while (classInfo) {
-        key = generatePropertyKey(name, classInfo.name);
-        result = propertyFromKey[key];
-        if (result) {
-            break;
-        }
-        classInfo = classInfo.baseClassInfo;
-    }
-    return result;
-}
-
-export module PropertyMetadataSettings {
-    export const None = 0;
-    export const AffectsLayout = 1;
-    export const AffectsStyle = 1 << 1;
-    export const Inheritable = 1 << 2;
-}
-
-export module ValueSource {
-    export const Default = 0;
-    export const Inherited = 1;
-    export const Css = 2;
-    export const Local = 3;
-    export const VisualState = 4;
-}
-
-export class PropertyMetadata implements PropertyMetadataDefinition {
-    public inheritable: boolean;
-    public affectsStyle: boolean;
-    public affectsLayout: boolean;
-    public onValueChanged: PropertyChangedCallback;
-    public onValidateValue: PropertyValidationCallback;
-    public equalityComparer: PropertyEqualityComparer;
-
-    constructor(
-        public defaultValue: any,
-        public options: number = PropertyMetadataSettings.None,
-        onChanged?: PropertyChangedCallback,
-        onValidateValue?: PropertyValidationCallback,
-        equalityComparer?: PropertyEqualityComparer) {
-            throw new Error("* @deprecated use 'ui/core/properties' module instead.");
-        }
-}
-
-export class Property implements PropertyDefinition {
-    public key: string;
-
-    public id: number;
-    public defaultValue;
-    public equalityComparer;
-    public inheritable;
-    public affectsStyle;
-    public affectsLayout;
-    public nameEvent: string;
-
-    public onValidateValue;
-    public onValueChanged: PropertyChangedCallback;
-
-    public valueConverter: (value: string) => any
-
-    constructor(public name: string, public ownerType: string, public metadata: PropertyMetadata, valueConverter?: (value: string) => any) {
-        throw new Error("* @deprecated use 'ui/core/properties' module instead.");
-    }
-
-    public defaultValueGetter: (instance: DependencyObservable) => NativeValueResult;
-}
-
-export class PropertyEntry implements PropertyEntryDefinition {
-    public valueSource: number = ValueSource.Default;
-    public defaultValue: any;
-    public inheritedValue: any;
-    public cssValue: any;
-    public localValue: any;
-    public effectiveValue: any;
-    public visualStateValue: any;
-
-    constructor(public property: Property) {
-        throw new Error("* @deprecated use 'ui/core/properties' module instead.");
-    }
-
-    public resetValue() {
-        this.valueSource = ValueSource.Default;
-        this.inheritedValue = this.cssValue = this.localValue = this.visualStateValue = this.effectiveValue = undefined;
-    }
-}
-
-export class DependencyObservable extends Observable implements DependencyObservableDefinition {
-    private _propertyEntries = {};
-
-    constructor() {
-        super();
-        throw new Error("* @deprecated use 'ui/core/view-base or ui/core/view' as base class.");
-    }
-    public set(name: string, value: any) {
-        const property = getPropertyByNameAndType(name, this);
-        if (property) {
-            this._setValueInternal(property, value, ValueSource.Local);
-        } else {
-            super.set(name, value);
-        }
-    }
-
-    public get(name: string): any {
-        const property = getPropertyByNameAndType(name, this);
-        if (property) {
-            return this._getValue(property);
-        } else {
-            return super.get(name);
-        }
-    }
-
-    public _setValue(property: Property, value: any, source?: number) {
-        this._setValueInternal(property, value, source || ValueSource.Local);
-    }
-
-    public _getValueSource(property: Property): number {
-        const entry: PropertyEntry = this._propertyEntries[property.id];
-        if (entry) {
-            return entry.valueSource;
-        }
-
-        return ValueSource.Default;
-    }
-
-    public _getValue(property: Property): any {
-        const entry: PropertyEntry = this._propertyEntries[property.id];
-        if (entry) {
-            return entry.effectiveValue;
-        }
-        else {
-            return this._getDefaultValue(property);
-        }
-    }
-
-    private _getDefaultValue(property: Property): any {
-        if (property.defaultValueGetter) {
-            // we check for cached properties only for these which have 'defaultValueGetter' defined;
-            // When DependencyProperties are removed from Style - fix this check.
-            let defaultValueResult = property.defaultValueGetter(this);
-            let defaultValue = defaultValueResult.result;
-            if (defaultValueResult.cacheable) {
-                let entry = new PropertyEntry(property);
-                entry.effectiveValue = entry.defaultValue = defaultValue;
-                this._propertyEntries[property.id] = entry;
-            }
-
-            return defaultValue;
-        }
-
-        return property.defaultValue;
-    }
-
-    public _resetValues(valueSource: number): void {
-        for (let i = 0, keys = Object.keys(this._propertyEntries); i < keys.length; i++) {
-            let key = keys[i];
-            let entry: PropertyEntry = this._propertyEntries[key];
-            this._resetValueInternal(entry.property, entry, valueSource);
-        }
-    }
-
-    public _resetValue(property: Property, valueSource: number = ValueSource.Local): void {
-        let entry: PropertyEntry = this._propertyEntries[property.id];
-        if (!entry) {
-            return;
-        }
-
-        this._resetValueInternal(property, entry, valueSource);
-    }
-
-    private _resetValueInternal(property: Property, entry: PropertyEntry, valueSource: number): void {
-        switch (valueSource) {
-            case ValueSource.Inherited:
-                entry.inheritedValue = undefined;
-                break;
-            case ValueSource.Css:
-                entry.cssValue = undefined;
-                break;
-            case ValueSource.Local:
-                entry.localValue = undefined;
-                break;
-            case ValueSource.VisualState:
-                entry.visualStateValue = undefined;
-                break;
-        }
-
-        let currentValueSource = entry.valueSource;
-        if (currentValueSource !== valueSource) {
-            // If current valueSource is larget than the one we reset - do nothing. 
-            // We are reseting property will lower priority and it won't change effectValue;
-            // Reseting larger source means we somehow was able to set value without updating currentValueSource which is clearly a bug.
-            return;
-        }
-
-        let currentValue = entry.effectiveValue;
-        let newValue = this.getEffectiveValueAndUpdateEntry(currentValueSource, entry, property);
-        if (!property.equalityComparer(currentValue, newValue)) {
-            // If we fallback to defalutValue - remove propertyEntry.
-            // Don't delete properties with ValueGetters because they will get their default value again
-            // and it will be the current native value (if it was set before that, e.g. it will be wrong).
-            if (entry.valueSource === ValueSource.Default && !property.defaultValueGetter) {
-                delete this._propertyEntries[property.id];
-            }
-            else {
-                entry.effectiveValue = newValue;
-            }
-
-            this._onPropertyChanged(property, currentValue, newValue);
-        }
-    }
-
-    public _onPropertyChanged(property: Property, oldValue: any, newValue: any) {
-        // let realNewValue = WrappedValue.unwrap(newValue);
-        let valueChanged = property.onValueChanged;
-        if (valueChanged) {
-            valueChanged({
-                object: this,
-                property: property,
-                eventName: Observable.propertyChangeEvent,
-                newValue: newValue,
-                oldValue: oldValue
-            });
-        }
-
-        let propName = property.name;
-        if (this.hasListeners(Observable.propertyChangeEvent)) {
-            this.notifyPropertyChange(propName, newValue);
-        }
-
-        let eventName = property.nameEvent;
-        if (this.hasListeners(eventName)) {
-            let ngChangedData = {
-                eventName: eventName,
-                propertyName: propName,
-                object: this,
-                value: newValue
-            }
-            this.notify(ngChangedData);
-        }
-    }
-
-    public _eachSetProperty(callback: (property: Property) => boolean) {
-        for (let i = 0, keys = Object.keys(this._propertyEntries); i < keys.length; i++) {
-            let key = keys[i];
-            let entry: PropertyEntry = this._propertyEntries[key];
-            if (!callback(entry.property)) {
-                break;
-            }
-        }
-    }
-
-    public _eachSetPropertyValue(callback: (property: Property, value: any) => boolean): void {
-        for (let i = 0, keys = Object.keys(this._propertyEntries); i < keys.length; i++) {
-            let key = keys[i];
-            let entry: PropertyEntry = this._propertyEntries[key];
-            if (entry.valueSource === ValueSource.Default) {
-                continue;
-            }
-            if (!callback(entry.property, entry.effectiveValue)) {
-                break;
-            }
-        }
-    }
-
-    private _setValueInternal(property: Property, value: any, source: number) {
-        if (value === unsetValue) {
-            this._resetValue(property, source);
-            return;
-        }
-
-        let wrapped = value && value.wrapped;
-        let realValue = wrapped ? WrappedValue.unwrap(value) : value;
-        let validate = property.onValidateValue;
-        if (validate && !validate(realValue)) {
-            throw new Error("Invalid value " + realValue + " for property " + property.name);
-        }
-
-        // Convert the value to the real property type in case it is coming as a string from CSS or XML.
-        let converter = property.valueConverter;
-        if (converter && isString(realValue)) {
-            realValue = converter(realValue);
-        }
-
-        let entry: PropertyEntry = this._propertyEntries[property.id];
-        let currentValue;
-        if (!entry) {
-            entry = new PropertyEntry(property);
-            entry.effectiveValue = this._getDefaultValue(property);
-            this._propertyEntries[property.id] = entry;
-        }
-
-        currentValue = entry.effectiveValue;
-
-        switch (source) {
-            case ValueSource.Inherited:
-                entry.inheritedValue = realValue;
-                break;
-
-            case ValueSource.Css:
-                entry.cssValue = realValue;
-                break;
-
-            case ValueSource.Local:
-                entry.localValue = realValue;
-                break;
-
-            case ValueSource.VisualState:
-                entry.visualStateValue = realValue;
-                break;
-        }
-
-        let currentValueSource = entry.valueSource;
-        if (currentValueSource > source) {
-            return;
-        }
-        else if (currentValueSource < source) {
-            entry.valueSource = source;
-        }
-
-        if (wrapped || !property.equalityComparer(currentValue, realValue)) {
-            entry.effectiveValue = realValue;
-            this._onPropertyChanged(property, currentValue, realValue);
-        }
-    }
-
-    private getEffectiveValueAndUpdateEntry(currentValueSource: number, entry: PropertyEntry, property: Property): any {
-        let newValue: any;
-        switch (currentValueSource) {
-            case ValueSource.Inherited:
-                newValue = property.defaultValue;
-                entry.valueSource = ValueSource.Default;
-                break;
-
-            case ValueSource.Css:
-                if (entry.inheritedValue !== undefined) {
-                    newValue = entry.inheritedValue;
-                    entry.valueSource = ValueSource.Inherited;
-                }
-                else {
-                    newValue = entry.defaultValue !== undefined ? entry.defaultValue : property.defaultValue;
-                    entry.valueSource = ValueSource.Default;
-                }
-                break;
-
-            case ValueSource.Local:
-                if (entry.cssValue !== undefined) {
-                    newValue = entry.cssValue;
-                    entry.valueSource = ValueSource.Css;
-                }
-                else if (entry.inheritedValue !== undefined) {
-                    newValue = entry.inheritedValue;
-                    entry.valueSource = ValueSource.Inherited;
-                }
-                else {
-                    newValue = entry.defaultValue !== undefined ? entry.defaultValue : property.defaultValue;
-                    entry.valueSource = ValueSource.Default;
-                }
-                break;
-
-            case ValueSource.VisualState:
-                if (entry.localValue !== undefined) {
-                    newValue = entry.localValue;
-                    entry.valueSource = ValueSource.Local;
-                }
-                else if (entry.cssValue !== undefined) {
-                    newValue = entry.cssValue;
-                    entry.valueSource = ValueSource.Css;
-                }
-                else if (entry.inheritedValue !== undefined) {
-                    newValue = entry.inheritedValue;
-                    entry.valueSource = ValueSource.Inherited;
-                }
-                else {
-                    newValue = entry.defaultValue !== undefined ? entry.defaultValue : property.defaultValue;
-                    entry.valueSource = ValueSource.Default;
-                }
-                break;
-        }
-
-        return newValue;
-    }
-}
diff --git a/tns-core-modules/ui/core/dependency-observable/package.json b/tns-core-modules/ui/core/dependency-observable/package.json
deleted file mode 100644
index 70f7ae94a..000000000
--- a/tns-core-modules/ui/core/dependency-observable/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name" : "dependency-observable",
-  "main" : "dependency-observable",
-  "types" : "dependency-observable.d.ts"
-}
diff --git a/tns-core-modules/ui/core/view-base/view-base.d.ts b/tns-core-modules/ui/core/view-base/view-base.d.ts
index b77b9e81f..16976b020 100644
--- a/tns-core-modules/ui/core/view-base/view-base.d.ts
+++ b/tns-core-modules/ui/core/view-base/view-base.d.ts
@@ -158,34 +158,6 @@ export abstract class ViewBase extends Observable {
     _suspendedUpdates: { [propertyName: string]: Property<ViewBase, any> | CssProperty<Style, any> | CssAnimationProperty<Style, any> };
     //@endprivate
 
-    /**
-     * @deprecated use showModal with ShowModalOptions instead
-     *
-     * Shows the View contained in moduleName as a modal view.
-     * @param moduleName - The name of the module to load starting from the application root.
-     * @param context - Any context you want to pass to the modally shown view.
-     * This same context will be available in the arguments of the shownModally event handler.
-     * @param closeCallback - A function that will be called when the view is closed.
-     * Any arguments provided when calling ShownModallyData.closeCallback will be available here.
-     * @param fullscreen - An optional parameter specifying whether to show the modal view in full-screen mode.
-     * @param animated - An optional parameter specifying whether to show the modal view with animation.
-     * @param stretched - An optional parameter specifying whether to stretch the modal view when not in full-screen mode.
-     */
-    showModal(moduleName: string, context: any, closeCallback: Function, fullscreen?: boolean, animated?: boolean, stretched?: boolean): ViewBase;
-
-    /**
-     * @deprecated use showModal with ShowModalOptions instead
-     *
-     * Shows the view passed as parameter as a modal view.
-     * @param view - View instance to be shown modally.
-     * @param context - Any context you want to pass to the modally shown view. This same context will be available in the arguments of the shownModally event handler.
-     * @param closeCallback - A function that will be called when the view is closed. Any arguments provided when calling ShownModallyData.closeCallback will be available here.
-     * @param fullscreen - An optional parameter specifying whether to show the modal view in full-screen mode.
-     * @param animated - An optional parameter specifying whether to show the modal view with animation.
-     * @param stretched - An optional parameter specifying whether to stretch the modal view when not in full-screen mode.
-     */
-    showModal(view: ViewBase, context: any, closeCallback: Function, fullscreen?: boolean, animated?: boolean, stretched?: boolean): ViewBase;
-
     /**
      * Shows the View contained in moduleName as a modal view.
      * @param moduleName - The name of the module to load starting from the application root.
@@ -200,11 +172,6 @@ export abstract class ViewBase extends Observable {
      */
     showModal(view: ViewBase, modalOptions: ShowModalOptions): ViewBase;
 
-    /**
-     * @deprecated use showModal method with arguments
-     */
-    showModal(): ViewBase;
-
     /**
      * Closes the current modal view that this page is showing.
      * @param context - Any context you want to pass back to the host when closing the modal view.
@@ -365,13 +332,7 @@ export abstract class ViewBase extends Observable {
     public cssPseudoClasses: Set<string>;
 
     public _goToVisualState(state: string): void;
-    /**
-     * @deprecated
-     *
-     * This used to be the way to set attribute values in early {N} versions.
-     * Now attributes are expected to be set as plain properties on the view instances.
-     */
-    public _applyXmlAttribute(attribute, value): boolean;
+
     public setInlineStyle(style: string): void;
 
     _context: any /* android.content.Context */;
diff --git a/tns-core-modules/ui/core/view-base/view-base.ts b/tns-core-modules/ui/core/view-base/view-base.ts
index caf868b0c..02ba4c96b 100644
--- a/tns-core-modules/ui/core/view-base/view-base.ts
+++ b/tns-core-modules/ui/core/view-base/view-base.ts
@@ -865,20 +865,6 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
         this.addPseudoClass(state);
     }
 
-    /**
-     * @deprecated
-     * 
-     * This used to be the way to set attribute values in early {N} versions.
-     * Now attributes are expected to be set as plain properties on the view instances.
-     */
-    public _applyXmlAttribute(attribute: string, value: string): boolean {
-        if (attribute === "style" || attribute === "rows" || attribute === "columns" || attribute === "fontAttributes") {
-            this[attribute] = value;
-            return true;
-        }
-        return false;
-    }
-
     public setInlineStyle(style: string): void {
         if (typeof style !== "string") {
             throw new Error("Parameter should be valid CSS string!");
diff --git a/tns-core-modules/ui/core/view/view-common.ts b/tns-core-modules/ui/core/view/view-common.ts
index d392dcfed..550e9ef40 100644
--- a/tns-core-modules/ui/core/view/view-common.ts
+++ b/tns-core-modules/ui/core/view/view-common.ts
@@ -21,7 +21,6 @@ import {
 } from "../../gestures";
 
 import { createViewFromEntry } from "../../builder";
-import { isAndroid } from "../../../platform";
 import { StyleScope } from "../../styling/style-scope";
 import { LinearGradient } from "../../styling/linear-gradient";
 import { BackgroundRepeat } from "../../styling/style-properties";
@@ -194,7 +193,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
         }
     }
 
-    observe(type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any): void {
+    _observe(type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any): void {
         if (!this._gestureObservers[type]) {
             this._gestureObservers[type] = [];
         }
@@ -212,7 +211,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 
             let gesture = gestureFromString(arg);
             if (gesture && !this._isEvent(arg)) {
-                this.observe(gesture, callback, thisArg);
+                this._observe(gesture, callback, thisArg);
             } else {
                 let events = (arg).split(",");
                 if (events.length > 0) {
@@ -220,7 +219,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
                         let evt = events[i].trim();
                         let gst = gestureFromString(evt);
                         if (gst && !this._isEvent(arg)) {
-                            this.observe(gst, callback, thisArg);
+                            this._observe(gst, callback, thisArg);
                         } else {
                             super.addEventListener(evt, callback, thisArg);
                         }
@@ -230,7 +229,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
                 }
             }
         } else if (typeof arg === "number") {
-            this.observe(<GestureTypes>arg, callback, thisArg);
+            this._observe(<GestureTypes>arg, callback, thisArg);
         }
     }
 
diff --git a/tns-core-modules/ui/core/view/view.android.ts b/tns-core-modules/ui/core/view/view.android.ts
index 72a462490..b4ef3ee82 100644
--- a/tns-core-modules/ui/core/view/view.android.ts
+++ b/tns-core-modules/ui/core/view/view.android.ts
@@ -263,14 +263,12 @@ export class View extends ViewCommon {
     private layoutChangeListener: android.view.View.OnLayoutChangeListener;
     private _manager: androidx.fragment.app.FragmentManager;
     private _rootManager: androidx.fragment.app.FragmentManager;
-    private _originalElevation: number;
-    private _originalStateListAnimator: any; /* android.animation.StateListAnimator; */
 
     nativeViewProtected: android.view.View;
 
     // TODO: Implement unobserve that detach the touchListener.
-    observe(type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any): void {
-        super.observe(type, callback, thisArg);
+    _observe(type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any): void {
+        super._observe(type, callback, thisArg);
         if (this.isLoaded && !this.touchListenerIsSet) {
             this.setOnTouchListener();
         }
diff --git a/tns-core-modules/ui/core/view/view.d.ts b/tns-core-modules/ui/core/view/view.d.ts
index a9d60c418..9015fbcf9 100644
--- a/tns-core-modules/ui/core/view/view.d.ts
+++ b/tns-core-modules/ui/core/view/view.d.ts
@@ -493,15 +493,6 @@ export abstract class View extends ViewBase {
 
     public getGestureObservers(type: GestureTypes): Array<GesturesObserver>;
 
-    /**
-     * @deprecated use on() instead
-     *
-     * @param type - Type of the gesture.
-     * @param callback - A function that will be executed when gesture is received.
-     * @param thisArg - An optional parameter which will be used as `this` context for callback execution.
-     */
-    observe(type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any);
-
     /**
      * A basic method signature to hook an event listener (shortcut alias to the addEventListener method).
      * @param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change") or you can use gesture types.
diff --git a/tns-core-modules/ui/date-picker/date-picker.ios.ts b/tns-core-modules/ui/date-picker/date-picker.ios.ts
index cc94b34f1..ac285f401 100644
--- a/tns-core-modules/ui/date-picker/date-picker.ios.ts
+++ b/tns-core-modules/ui/date-picker/date-picker.ios.ts
@@ -3,8 +3,6 @@
     dateProperty, maxDateProperty, minDateProperty, colorProperty, Color
 } from "./date-picker-common";
 
-import { ios } from "../../utils/utils";
-
 export * from "./date-picker-common";
 
 export class DatePicker extends DatePickerBase {
diff --git a/tns-core-modules/ui/frame/frame-common.ts b/tns-core-modules/ui/frame/frame-common.ts
index b88d79c56..1c8eac70c 100644
--- a/tns-core-modules/ui/frame/frame-common.ts
+++ b/tns-core-modules/ui/frame/frame-common.ts
@@ -711,7 +711,7 @@ export function goBack(): boolean {
     return false;
 }
 
-export function stack(): Array<FrameBase> {
+export function _stack(): Array<FrameBase> {
     return frameStack;
 }
 
diff --git a/tns-core-modules/ui/frame/frame.android.ts b/tns-core-modules/ui/frame/frame.android.ts
index 0d0ab1af7..ca572e75e 100644
--- a/tns-core-modules/ui/frame/frame.android.ts
+++ b/tns-core-modules/ui/frame/frame.android.ts
@@ -1,14 +1,14 @@
 // Definitions.
 import {
     AndroidFrame as AndroidFrameDefinition, AndroidActivityCallbacks,
-    AndroidFragmentCallbacks, BackstackEntry, NavigationTransition, NavigationEntry
+    AndroidFragmentCallbacks, BackstackEntry, NavigationTransition
 } from ".";
 import { Page } from "../page";
 
 // Types.
 import * as application from "../../application";
 import {
-    FrameBase, goBack, stack, NavigationType,
+    FrameBase, goBack, _stack, NavigationType,
     Observable, View, traceCategories, traceEnabled, traceError, traceWrite
 } from "./frame-common";
 
@@ -596,7 +596,6 @@ class AndroidFrame extends Observable implements AndroidFrameDefinition {
 
     private _showActionBar = true;
     private _owner: Frame;
-    public cachePagesOnNavigate: boolean = true;
 
     constructor(owner: Frame) {
         super();
@@ -657,7 +656,7 @@ class AndroidFrame extends Observable implements AndroidFrameDefinition {
             return activity;
         }
 
-        let frames = stack();
+        let frames = _stack();
         for (let length = frames.length, i = length - 1; i >= 0; i--) {
             activity = frames[i].android.activity;
             if (activity) {
@@ -1213,7 +1212,7 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks {
         savedInstanceState: android.os.Bundle,
         fireLaunchEvent: boolean
     ): void {
-        const shouldCreateRootFrame = application.shouldCreateRootFrame();
+        const shouldCreateRootFrame = application._shouldCreateRootFrame();
         let rootView = this._rootView;
 
         if (traceEnabled()) {
diff --git a/tns-core-modules/ui/frame/frame.d.ts b/tns-core-modules/ui/frame/frame.d.ts
index ef95ccb71..5d5eaf324 100644
--- a/tns-core-modules/ui/frame/frame.d.ts
+++ b/tns-core-modules/ui/frame/frame.d.ts
@@ -14,13 +14,6 @@ export * from "../page";
  * Nested frames are supported, enabling hierarchical navigation scenarios.
  */
 export class Frame extends View {
-    /**
-     * @deprecated
-     *
-     * String value used when hooking to androidOptionSelected event (prefix `android` states that this event is available only in Android).
-     */
-    public static androidOptionSelectedEvent: string;
-
     /**
      * Navigates to the previous entry (if any) in the back stack.
      * @param to The backstack entry to navigate back to.
@@ -190,11 +183,6 @@ export class Frame extends View {
      * @param thisArg - An optional parameter which will be used as `this` context for callback execution.
      */
     on(eventNames: string, callback: (args: EventData) => void, thisArg?: any);
-
-    /**
-     * Raised when native android [onOptionsItemSelected method](http://developer.android.com/reference/android/app/Activity.html#onOptionsItemSelected(android.view.MenuItem)) is called.
-     */
-    on(event: "optionSelected", callback: (args: EventData) => void, thisArg?: any);
 }
 
 /**
@@ -218,12 +206,12 @@ export function topmost(): Frame;
  */
 export function goBack();
 
+//@private
 /**
- * @deprecated use getFrameById() if you want to retrieve a frame different than the topmost one
- *
- * Gets the frames stack.
+ * @private
  */
-export function stack(): Array<Frame>;
+export function _stack(): Array<Frame>;
+//@endprivate
 
 /**
  * Represents an entry to be used to create a view or load it form file
@@ -368,22 +356,6 @@ export interface BackstackEntry {
     //@endprivate
 }
 
-/**
- * Represents the data passed to the androidOptionSelected event.
- * This event is raised by the Android OS when an option in the Activity's action bar has been selected.
- */
-export interface AndroidOptionEventData extends EventData {
-    /**
-     * Gets the Android-specific menu item that has been selected.
-     */
-    item: any /* android.view.IMenuItem */;
-
-    /**
-     * True to mark the event as handled (that is to prevent the default processing).
-     */
-    handled: boolean;
-}
-
 /**
  * Represents the Android-specific Frame object, aggregated within the common Frame one.
  * In Android there are two types of navigation - using new Activity instances or using Fragments within the main Activity.
@@ -415,13 +387,6 @@ export interface AndroidFrame extends Observable {
      */
     showActionBar: boolean;
 
-    /**
-     * @deprecated this property is not used internally
-     *
-     * Gets or sets whether the page UI will be cached when navigating away from the page.
-     */
-    cachePagesOnNavigate: boolean;
-
     /**
      * Finds the native androidx.fragment.app.Fragment instance created for the specified Page.
      * @param page The Page instance to search for.
@@ -433,10 +398,6 @@ export interface AndroidActivityCallbacks {
     getRootView(): View;
     resetActivityContent(activity: any): void;
 
-    /**
-     * @deprecated use onCreate(activity, savedInstanceState, intent, superFunc) instead.
-     */
-    onCreate(activity: any, savedInstanceState: any, superFunc: Function): void;
     onCreate(activity: any, savedInstanceState: any, intent: any, superFunc: Function): void;
     onSaveInstanceState(activity: any, outState: any, superFunc: Function): void;
     onStart(activity: any, superFunc: Function): void;
diff --git a/tns-core-modules/ui/list-picker/list-picker.ios.ts b/tns-core-modules/ui/list-picker/list-picker.ios.ts
index 935b2d084..8c952840b 100644
--- a/tns-core-modules/ui/list-picker/list-picker.ios.ts
+++ b/tns-core-modules/ui/list-picker/list-picker.ios.ts
@@ -6,6 +6,7 @@ export * from "./list-picker-common";
 
 export class ListPicker extends ListPickerBase {
     nativeViewProtected: UIPickerView;
+    // tslint:disable-next-line 
     private _dataSource: ListPickerDataSource;
     private _delegate: ListPickerDelegateImpl;
     
diff --git a/tns-core-modules/ui/list-view/list-view.ios.ts b/tns-core-modules/ui/list-view/list-view.ios.ts
index 8fb180625..333b393e5 100644
--- a/tns-core-modules/ui/list-view/list-view.ios.ts
+++ b/tns-core-modules/ui/list-view/list-view.ios.ts
@@ -208,6 +208,7 @@ class UITableViewRowHeightDelegateImpl extends NSObject implements UITableViewDe
 
 export class ListView extends ListViewBase {
     public nativeViewProtected: UITableView;
+    // tslint:disable-next-line
     private _dataSource;
     private _delegate;
     private _heights: Array<number>;
diff --git a/tns-core-modules/ui/tab-navigation-base/tab-content-item/tab-content-item.ios.ts b/tns-core-modules/ui/tab-navigation-base/tab-content-item/tab-content-item.ios.ts
index 88e6c770c..fcb53124c 100644
--- a/tns-core-modules/ui/tab-navigation-base/tab-content-item/tab-content-item.ios.ts
+++ b/tns-core-modules/ui/tab-navigation-base/tab-content-item/tab-content-item.ios.ts
@@ -4,6 +4,7 @@ import { TabContentItemBase } from "./tab-content-item-common";
 export * from "./tab-content-item-common";
 
 export class TabContentItem extends TabContentItemBase {
+    // tslint:disable-next-line
     private __controller: UIViewController;
 
     public setViewController(controller: UIViewController, nativeView: UIView) {
diff --git a/tns-core-modules/ui/tabs/tabs.ios.ts b/tns-core-modules/ui/tabs/tabs.ios.ts
index 27d6fd6d1..0efb2dca3 100644
--- a/tns-core-modules/ui/tabs/tabs.ios.ts
+++ b/tns-core-modules/ui/tabs/tabs.ios.ts
@@ -8,18 +8,17 @@ import { selectedIndexProperty, itemsProperty, tabStripProperty } from "../tab-n
 import { TabsBase, swipeEnabledProperty } from "./tabs-common";
 import { Frame } from "../frame";
 import { ios as iosView, View } from "../core/view";
-import { ios as iosUtils, layout } from "../../utils/utils"
-import { device } from "../../platform";
+import { /*ios as iosUtils,*/ layout } from "../../utils/utils"
+// import { device } from "../../platform";
 import { fromFileOrResource } from "../../image-source";
-import { Color } from "../../color";
 
 // TODO
 // import { profile } from "../../profiling";
 
 export * from "./tabs-common";
 
-const majorVersion = iosUtils.MajorVersion;
-const isPhone = device.deviceType === "Phone";
+// const majorVersion = iosUtils.MajorVersion;
+// const isPhone = device.deviceType === "Phone";
 
 class MDCTabBarDelegateImpl extends NSObject implements MDCTabBarDelegate {
     public static ObjCProtocols = [MDCTabBarDelegate];
@@ -501,33 +500,33 @@ class UIPageViewControllerDelegateImpl extends NSObject implements UIPageViewCon
 //     }
 // }
 
-function updateTitleAndIconPositions(tabStripItem: TabStripItem, tabBarItem: UITabBarItem, controller: UIViewController) {
-    if (!tabStripItem || !tabBarItem) {
-        return;
-    }
+// function updateTitleAndIconPositions(tabStripItem: TabStripItem, tabBarItem: UITabBarItem, controller: UIViewController) {
+//     if (!tabStripItem || !tabBarItem) {
+//         return;
+//     }
 
-    // For iOS <11 icon is *always* above the text.
-    // For iOS 11 icon is above the text *only* on phones in portrait mode.
-    const orientation = controller.interfaceOrientation;
-    const isPortrait = orientation !== UIInterfaceOrientation.LandscapeLeft && orientation !== UIInterfaceOrientation.LandscapeRight;
-    const isIconAboveTitle = (majorVersion < 11) || (isPhone && isPortrait);
+//     // For iOS <11 icon is *always* above the text.
+//     // For iOS 11 icon is above the text *only* on phones in portrait mode.
+//     const orientation = controller.interfaceOrientation;
+//     const isPortrait = orientation !== UIInterfaceOrientation.LandscapeLeft && orientation !== UIInterfaceOrientation.LandscapeRight;
+//     const isIconAboveTitle = (majorVersion < 11) || (isPhone && isPortrait);
 
-    if (!tabStripItem.iconSource) {
-        if (isIconAboveTitle) {
-            tabBarItem.titlePositionAdjustment = { horizontal: 0, vertical: -20 };
-        } else {
-            tabBarItem.titlePositionAdjustment = { horizontal: 0, vertical: 0 };
-        }
-    }
+//     if (!tabStripItem.iconSource) {
+//         if (isIconAboveTitle) {
+//             tabBarItem.titlePositionAdjustment = { horizontal: 0, vertical: -20 };
+//         } else {
+//             tabBarItem.titlePositionAdjustment = { horizontal: 0, vertical: 0 };
+//         }
+//     }
 
-    if (!tabStripItem.title) {
-        if (isIconAboveTitle) {
-            tabBarItem.imageInsets = new UIEdgeInsets({ top: 6, left: 0, bottom: -6, right: 0 });
-        } else {
-            tabBarItem.imageInsets = new UIEdgeInsets({ top: 0, left: 0, bottom: 0, right: 0 });
-        }
-    }
-}
+//     if (!tabStripItem.title) {
+//         if (isIconAboveTitle) {
+//             tabBarItem.imageInsets = new UIEdgeInsets({ top: 6, left: 0, bottom: -6, right: 0 });
+//         } else {
+//             tabBarItem.imageInsets = new UIEdgeInsets({ top: 0, left: 0, bottom: 0, right: 0 });
+//         }
+//     }
+// }
 
 function iterateIndexRange(index: number, eps: number, lastIndex: number, callback: (i) => void) {
     const rangeStart = Math.max(0, index - eps);
@@ -706,7 +705,7 @@ export class Tabs extends TabsBase {
         }
     }
 
-    private _actionBarHiddenByTabView: boolean;
+    // private _actionBarHiddenByTabView: boolean;
     // public _handleTwoNavigationBars(backToMoreWillBeVisible: boolean) {
     //     // TODO
     //     // if (traceEnabled()) {
@@ -788,7 +787,7 @@ export class Tabs extends TabsBase {
 
         // const controllers = NSMutableArray.alloc<UIViewController>().initWithCapacity(length);
 
-        const selectedItem = items[this.selectedIndex];
+        // const selectedItem = items[this.selectedIndex];
         // const controller = this.getViewController(selectedItem);
         // controllers.addObject(controller);
 
@@ -910,17 +909,17 @@ export class Tabs extends TabsBase {
         return image;
     }
 
-    private _updateIOSTabBarColorsAndFonts(): void {
-        // if (!this.tabStrip || !this.tabStrip.items || !this.tabStrip.items.length) {
-        //     return;
-        // }
+    // private _updateIOSTabBarColorsAndFonts(): void {
+    //     if (!this.tabStrip || !this.tabStrip.items || !this.tabStrip.items.length) {
+    //         return;
+    //     }
 
-        // const tabBar = <UITabBar>this.ios.tabBar;
-        // const states = getTitleAttributesForStates(this);
-        // for (let i = 0; i < tabBar.items.count; i++) {
-        //     applyStatesToItem(tabBar.items[i], states);
-        // }
-    }
+    //     const tabBar = <UITabBar>this.ios.tabBar;
+    //     const states = getTitleAttributesForStates(this);
+    //     for (let i = 0; i < tabBar.items.count; i++) {
+    //         applyStatesToItem(tabBar.items[i], states);
+    //     }
+    // }
 
     // TODO: Move this to TabStripItem
     // [fontInternalProperty.getDefault](): Font {
@@ -992,35 +991,35 @@ export class Tabs extends TabsBase {
     }
 }
 
-interface TabStates {
-    normalState?: any;
-    selectedState?: any;
-}
+// interface TabStates {
+//     normalState?: any;
+//     selectedState?: any;
+// }
 
-function getTitleAttributesForStates(tabView: Tabs): TabStates {
-    const result: TabStates = {};
+// function getTitleAttributesForStates(tabView: Tabs): TabStates {
+//     const result: TabStates = {};
 
-    const defaultTabItemFontSize = 10;
-    const tabItemFontSize = tabView.style.tabTextFontSize || defaultTabItemFontSize;
-    const font: UIFont = tabView.style.fontInternal.getUIFont(UIFont.systemFontOfSize(tabItemFontSize));
-    const tabItemTextColor = tabView.style.tabTextColor;
-    const textColor = tabItemTextColor instanceof Color ? tabItemTextColor.ios : null;
-    result.normalState = { [NSFontAttributeName]: font }
-    if (textColor) {
-        result.normalState[UITextAttributeTextColor] = textColor
-    }
+//     const defaultTabItemFontSize = 10;
+//     const tabItemFontSize = tabView.style.tabTextFontSize || defaultTabItemFontSize;
+//     const font: UIFont = tabView.style.fontInternal.getUIFont(UIFont.systemFontOfSize(tabItemFontSize));
+//     const tabItemTextColor = tabView.style.tabTextColor;
+//     const textColor = tabItemTextColor instanceof Color ? tabItemTextColor.ios : null;
+//     result.normalState = { [NSFontAttributeName]: font }
+//     if (textColor) {
+//         result.normalState[UITextAttributeTextColor] = textColor
+//     }
 
-    const tabSelectedItemTextColor = tabView.style.selectedTabTextColor;
-    const selectedTextColor = tabItemTextColor instanceof Color ? tabSelectedItemTextColor.ios : null;
-    result.selectedState = { [NSFontAttributeName]: font }
-    if (selectedTextColor) {
-        result.selectedState[UITextAttributeTextColor] = selectedTextColor
-    }
+//     const tabSelectedItemTextColor = tabView.style.selectedTabTextColor;
+//     const selectedTextColor = tabItemTextColor instanceof Color ? tabSelectedItemTextColor.ios : null;
+//     result.selectedState = { [NSFontAttributeName]: font }
+//     if (selectedTextColor) {
+//         result.selectedState[UITextAttributeTextColor] = selectedTextColor
+//     }
 
-    return result;
-}
+//     return result;
+// }
 
-function applyStatesToItem(item: UITabBarItem, states: TabStates) {
-    item.setTitleTextAttributesForState(states.normalState, UIControlState.Normal);
-    item.setTitleTextAttributesForState(states.selectedState, UIControlState.Selected);
-}
\ No newline at end of file
+// function applyStatesToItem(item: UITabBarItem, states: TabStates) {
+//     item.setTitleTextAttributesForState(states.normalState, UIControlState.Normal);
+//     item.setTitleTextAttributesForState(states.selectedState, UIControlState.Selected);
+// }
\ No newline at end of file
diff --git a/tns-core-modules/ui/utils.d.ts b/tns-core-modules/ui/utils.d.ts
index 8ddc436c0..e54e208bd 100644
--- a/tns-core-modules/ui/utils.d.ts
+++ b/tns-core-modules/ui/utils.d.ts
@@ -10,14 +10,6 @@ export module ios {
      */
     export function getActualHeight(uiView: any /* UIView */): number;
 
-    /**
-     * @deprecated
-     * 
-     * @param rootView 
-     * @param parentBounds 
-     */
-    export function _layoutRootView(rootView: View, parentBounds: any /* CGRect */): void;
-
     /**
      * Gets the height of the status bar in device pixels.
      * @param viewController when specified it is used to check preferStatusBarHidden property.
diff --git a/tns-core-modules/ui/utils.ios.ts b/tns-core-modules/ui/utils.ios.ts
index fe6bd6799..7e7aee6d8 100644
--- a/tns-core-modules/ui/utils.ios.ts
+++ b/tns-core-modules/ui/utils.ios.ts
@@ -1,5 +1,4 @@
-import { View } from "./core/view";
-import * as utils from "../utils/utils";
+import * as utils from "../utils/utils";
 
 export module ios {
     export function getActualHeight(view: UIView): number {
@@ -24,25 +23,4 @@ export module ios {
         const min = Math.min(statusFrame.size.width, statusFrame.size.height);
         return utils.layout.toDevicePixels(min);
     }
-
-    export function _layoutRootView(rootView: View, parentBounds: CGRect) {
-        if (!rootView || !parentBounds) {
-            return;
-        }
-
-        const size = parentBounds.size;
-        const width = utils.layout.toDevicePixels(size.width);
-        const height = utils.layout.toDevicePixels(size.height);
-
-        const widthSpec = utils.layout.makeMeasureSpec(width, utils.layout.EXACTLY);
-        const heightSpec = utils.layout.makeMeasureSpec(height, utils.layout.EXACTLY);
-        
-        rootView.measure(widthSpec, heightSpec);
-
-        const origin = parentBounds.origin;
-        const left = origin.x;
-        const top = origin.y;
-
-        rootView.layout(left, top, width, height);
-    }
 }
\ No newline at end of file
diff --git a/tns-core-modules/ui/web-view/web-view-common.ts b/tns-core-modules/ui/web-view/web-view-common.ts
index d7457524b..e541f4de5 100644
--- a/tns-core-modules/ui/web-view/web-view-common.ts
+++ b/tns-core-modules/ui/web-view/web-view-common.ts
@@ -85,13 +85,6 @@ export abstract class WebViewBase extends ContainerView implements WebViewDefini
             this._loadData(src);
         }
     }
-
-    get url(): string {
-        throw new Error("Property url of WebView is deprecated. Use src instead");
-    }
-    set url(value: string) {
-        throw new Error("Property url of WebView is deprecated. Use src instead")
-    }
 }
 export interface WebViewBase {
     on(eventNames: string, callback: (data: EventData) => void, thisArg?: any);
diff --git a/tns-core-modules/utils/utils.d.ts b/tns-core-modules/utils/utils.d.ts
index 08a1d80c6..f249c4303 100644
--- a/tns-core-modules/utils/utils.d.ts
+++ b/tns-core-modules/utils/utils.d.ts
@@ -185,15 +185,6 @@ export module ad {
  * Module with ios specific utilities.
  */
 export module ios {
-    /**
-     * @deprecated use the respective native property directly
-     *
-     * Checks if the property is a function and if it is, calls it on this.
-     * Designed to support backward compatibility for methods that became properties.
-     * Will not work on delegates since it checks if the propertyValue is a function, and delegates are marshalled as functions.
-     * Example: getter(NSRunLoop, NSRunLoop.currentRunLoop).runUntilDate(NSDate.dateWithTimeIntervalSinceNow(waitTime));
-     */
-    export function getter<T>(_this: any, propertyValue: T | { (): T }): T;
 
     // Common properties between UILabel, UITextView and UITextField
     export interface TextUIView {
diff --git a/tns-core-modules/utils/utils.ios.ts b/tns-core-modules/utils/utils.ios.ts
index 143ee7dce..e6c7c1237 100644
--- a/tns-core-modules/utils/utils.ios.ts
+++ b/tns-core-modules/utils/utils.ios.ts
@@ -49,8 +49,8 @@ export module layout {
 Object.assign(layout, layoutCommon);
 
 export module ios {
-    export function getter<T>(_this: any, property: T | { (): T }): T {
-        console.log("utils.ios.getter() is deprecated; use the respective native property instead");
+    // TODO: remove for NativeScript 7.0
+    export function _getter<T>(_this: any, property: T | { (): T }): T {
         if (typeof property === "function") {
             return (<{ (): T }>property).call(_this);
         } else {
diff --git a/tsconfig.tslint.json b/tsconfig.tslint.json
new file mode 100644
index 000000000..0402e2059
--- /dev/null
+++ b/tsconfig.tslint.json
@@ -0,0 +1,16 @@
+{
+    "extends": "./tsconfig.shared",
+    "compilerOptions": {
+        "noUnusedLocals": true,
+        "noUnusedParameters": true
+    },
+    "include": [
+        "tns-core-modules",
+        "tests",
+        "e2e"
+    ],
+    "exclude": [
+        "**/node_modules/**",
+        "**/platforms/**"
+    ]
+}