diff --git a/tests/app/xml-declaration/template-builder-tests/template-view.ts b/tests/app/xml-declaration/template-builder-tests/template-view.ts
index a5f65d710..db9af7c68 100644
--- a/tests/app/xml-declaration/template-builder-tests/template-view.ts
+++ b/tests/app/xml-declaration/template-builder-tests/template-view.ts
@@ -1,6 +1,4 @@
-import { Template } from "ui/core/view"
 import { Property } from "ui/core/properties"
-import * as proxy from "ui/core/proxy"
 import { LayoutBase } from "ui/layouts/layout-base"
 import { parse } from "ui/builder"
 
diff --git a/tns-core-modules/ui/segmented-bar/segmented-bar.android.ts b/tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
index 3efc3d6d5..074a5653d 100644
--- a/tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
+++ b/tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
@@ -255,13 +255,8 @@ export class SegmentedBar extends SegmentedBarBase {
         this._android.clearAllTabs();
 
         const newItems = value;
-        let tabHost = this._android;
         if (newItems) {
             newItems.forEach((item, i, arr) => this.insertTab(item, i));
-
-            // if (this.selectedIndex < 0) {
-            //     this.selectedIndex = tabHost.getCurrentTab();
-            // }
         }
     }
 }
@@ -285,4 +280,4 @@ function ensureTabHostClass() {
     }
 
     TabHostClass = OurTabHost;
-}
\ No newline at end of file
+}
diff --git a/tns-core-modules/ui/segmented-bar/segmented-bar.ios.ts b/tns-core-modules/ui/segmented-bar/segmented-bar.ios.ts
index 133d164f8..d7cea0157 100644
--- a/tns-core-modules/ui/segmented-bar/segmented-bar.ios.ts
+++ b/tns-core-modules/ui/segmented-bar/segmented-bar.ios.ts
@@ -56,10 +56,6 @@ export class SegmentedBar extends SegmentedBarBase {
                 title = (title === null || title === undefined) ? "" : title;
                 segmentedControl.insertSegmentWithTitleAtIndexAnimated(title, index, false);
             })
-
-            // if (this.selectedIndex < 0) {
-            //     this.selectedIndex = segmentedControl.selectedSegmentIndex;
-            // }
         }
     }