diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 3daeec9e5..a44d0d1e4 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -212,10 +212,6 @@
       <DependentUpon>xmlbasics.xml</DependentUpon>
     </TypeScriptCompile>
     <TypeScriptCompile Include="apps\ui-tests-app\bindings\basics.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\custom-components\mymodulewithxml\MyControl.ts">
-      <DependentUpon>MyControl.xml</DependentUpon>
-    </TypeScriptCompile>
-    <TypeScriptCompile Include="apps\ui-tests-app\custom-components\mymodule\MyControl.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\layouts\absolute.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\layouts\dock.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\layouts\grid.ts" />
@@ -713,12 +709,6 @@
     <Content Include="apps\tests\xml-declaration\mymodulewithxml\MyControl.css" />
     <Content Include="apps\tests\xml-declaration\mymodule\MyControl.css" />
     <Content Include="apps\ui-tests-app\bindings\xmlbasics.xml" />
-    <Content Include="apps\ui-tests-app\custom-components\mymodulewithxml\MyControl.css" />
-    <Content Include="apps\ui-tests-app\custom-components\mymodulewithxml\MyControl.xml">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="apps\ui-tests-app\custom-components\mymodule\MyControl.css" />
-    <Content Include="apps\ui-tests-app\custom-components\page.xml" />
     <Content Include="apps\ui-tests-app\layouts\absolute.xml" />
     <Content Include="apps\ui-tests-app\layouts\dock.xml" />
     <Content Include="apps\ui-tests-app\layouts\grid.xml" />
@@ -1601,12 +1591,6 @@
     <Content Include="apps\cuteness.unoptimized\package.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="apps\ui-tests-app\custom-components\mymodule\package.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="apps\ui-tests-app\custom-components\mymodulewithxml\package.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <None Include="js-libs\esprima\LICENSE.BSD" />
     <Content Include="source-control.md" />
     <Content Include="ui\segmented-bar\package.json">
@@ -1692,7 +1676,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
+      <UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/apps/ui-tests-app/custom-components/mymodule/MyControl.css b/apps/ui-tests-app/custom-components/mymodule/MyControl.css
deleted file mode 100644
index d701672c7..000000000
--- a/apps/ui-tests-app/custom-components/mymodule/MyControl.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.MyStackLayout {
-    background-color: red;
-}
diff --git a/apps/ui-tests-app/custom-components/mymodule/MyControl.ts b/apps/ui-tests-app/custom-components/mymodule/MyControl.ts
deleted file mode 100644
index aca0396d3..000000000
--- a/apps/ui-tests-app/custom-components/mymodule/MyControl.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import observable = require("data/observable");
-import stackLayoutModule = require("ui/layouts/stack-layout");
-import label = require("ui/label");
-import button = require("ui/button");
-
-export class MyControl extends stackLayoutModule.StackLayout {
-    constructor() {
-        super();
-
-        var counter: number = 0;
-
-        var lbl = new label.Label();
-        var btn = new button.Button();
-        btn.text = "Tap me!";
-        btn.on(button.Button.tapEvent, (args: observable.EventData) => {
-            lbl.text = "Tap " + counter++;
-        });
-
-        this.addChild(lbl);
-        this.addChild(btn);
-
-        this.cssClass = "MyStackLayout";
-    }
-}
\ No newline at end of file
diff --git a/apps/ui-tests-app/custom-components/mymodule/package.json b/apps/ui-tests-app/custom-components/mymodule/package.json
deleted file mode 100644
index 55267b5f2..000000000
--- a/apps/ui-tests-app/custom-components/mymodule/package.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "name" : "MyControl",
-  "main" : "MyControl.js" }
\ No newline at end of file
diff --git a/apps/ui-tests-app/custom-components/mymodulewithxml/MyControl.css b/apps/ui-tests-app/custom-components/mymodulewithxml/MyControl.css
deleted file mode 100644
index dd3ccf653..000000000
--- a/apps/ui-tests-app/custom-components/mymodulewithxml/MyControl.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.MySecondCustomStackLayout {
-    background-color: green;
-}
diff --git a/apps/ui-tests-app/custom-components/mymodulewithxml/MyControl.ts b/apps/ui-tests-app/custom-components/mymodulewithxml/MyControl.ts
deleted file mode 100644
index 532f0f6c5..000000000
--- a/apps/ui-tests-app/custom-components/mymodulewithxml/MyControl.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import observable = require("data/observable");
-import view = require("ui/core/view");
-import label = require("ui/label");
-
-var count = 0;
-export function buttonTap2(args: observable.EventData) {
-    count++;
-
-    var parent = (<view.View>args.object).parent;
-    if (parent) {
-        var lbl = parent.getViewById<label.Label>("Label1");
-        if (lbl) {
-            lbl.text = "You clicked " + count + " times!";
-        }
-    }
-}
\ No newline at end of file
diff --git a/apps/ui-tests-app/custom-components/mymodulewithxml/MyControl.xml b/apps/ui-tests-app/custom-components/mymodulewithxml/MyControl.xml
deleted file mode 100644
index 4fe8e30f7..000000000
--- a/apps/ui-tests-app/custom-components/mymodulewithxml/MyControl.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<StackLayout xmlns:customControls="xml-declaration/mymodule" cssClass="MySecondCustomStackLayout">
-  <Label id="Label1" text="mymodulewithxml" />
-  <Button text="Click!" tap="buttonTap2" /> 
-</StackLayout>
diff --git a/apps/ui-tests-app/custom-components/mymodulewithxml/package.json b/apps/ui-tests-app/custom-components/mymodulewithxml/package.json
deleted file mode 100644
index 55267b5f2..000000000
--- a/apps/ui-tests-app/custom-components/mymodulewithxml/package.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "name" : "MyControl",
-  "main" : "MyControl.js" }
\ No newline at end of file
diff --git a/apps/ui-tests-app/custom-components/page.xml b/apps/ui-tests-app/custom-components/page.xml
deleted file mode 100644
index 26559db84..000000000
--- a/apps/ui-tests-app/custom-components/page.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Page xmlns:customControls="custom-components/mymodule"
-      xmlns:customControls2="custom-components/mymodulewithxml">
-  <StackLayout>
-    <customControls:MyControl />
-    <customControls2:MyControl />
-  </StackLayout>
-</Page>
\ No newline at end of file