diff --git a/.gitignore b/.gitignore
index e396e840f..43f531d3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 #IDE specific files
 .idea/*
+out/*
diff --git a/out/artifacts/java_client/java-client.jar b/out/artifacts/java_client/java-client.jar
deleted file mode 100644
index bf5828fac..000000000
Binary files a/out/artifacts/java_client/java-client.jar and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/AppiumDriver.class b/out/production/java-client/io/appium/java_client/AppiumDriver.class
deleted file mode 100644
index ececfe5d7..000000000
Binary files a/out/production/java-client/io/appium/java_client/AppiumDriver.class and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/ContextTest.class b/out/production/java-client/io/appium/java_client/ContextTest.class
deleted file mode 100644
index 002726388..000000000
Binary files a/out/production/java-client/io/appium/java_client/ContextTest.class and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/DriverMobileCommand.class b/out/production/java-client/io/appium/java_client/DriverMobileCommand.class
deleted file mode 100644
index 41565c457..000000000
Binary files a/out/production/java-client/io/appium/java_client/DriverMobileCommand.class and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/ErrorCodesMobile.class b/out/production/java-client/io/appium/java_client/ErrorCodesMobile.class
deleted file mode 100644
index b4ad6bc45..000000000
Binary files a/out/production/java-client/io/appium/java_client/ErrorCodesMobile.class and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/MobileDriver.class b/out/production/java-client/io/appium/java_client/MobileDriver.class
deleted file mode 100644
index 90200f76e..000000000
Binary files a/out/production/java-client/io/appium/java_client/MobileDriver.class and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/MobileErrorHandler.class b/out/production/java-client/io/appium/java_client/MobileErrorHandler.class
deleted file mode 100644
index 811a71e99..000000000
Binary files a/out/production/java-client/io/appium/java_client/MobileErrorHandler.class and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/NoSuchContextException.class b/out/production/java-client/io/appium/java_client/NoSuchContextException.class
deleted file mode 100644
index 88e30f3eb..000000000
Binary files a/out/production/java-client/io/appium/java_client/NoSuchContextException.class and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/Default-568h@2x.png b/out/production/java-client/io/appium/java_client/WebViewApp.app/Default-568h@2x.png
deleted file mode 100644
index 0891b7aab..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/Default-568h@2x.png and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/Default.png b/out/production/java-client/io/appium/java_client/WebViewApp.app/Default.png
deleted file mode 100644
index 4c8ca6f69..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/Default.png and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/Default@2x.png b/out/production/java-client/io/appium/java_client/WebViewApp.app/Default@2x.png
deleted file mode 100644
index 35b84cffe..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/Default@2x.png and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/Info.plist b/out/production/java-client/io/appium/java_client/WebViewApp.app/Info.plist
deleted file mode 100644
index 745f9ce1d..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/Info.plist and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/PkgInfo b/out/production/java-client/io/appium/java_client/WebViewApp.app/PkgInfo
deleted file mode 100644
index bd04210fb..000000000
--- a/out/production/java-client/io/appium/java_client/WebViewApp.app/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
\ No newline at end of file
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/WebViewApp b/out/production/java-client/io/appium/java_client/WebViewApp.app/WebViewApp
deleted file mode 100755
index 10f58dc08..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/WebViewApp and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/cybervillainsCA.cer b/out/production/java-client/io/appium/java_client/WebViewApp.app/cybervillainsCA.cer
deleted file mode 100644
index 945a93de0..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/cybervillainsCA.cer and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/InfoPlist.strings b/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/InfoPlist.strings
deleted file mode 100644
index 3967e063f..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/InfoPlist.strings and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPad.storyboardc/Info.plist b/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPad.storyboardc/Info.plist
deleted file mode 100644
index 191e37b8a..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPad.storyboardc/Info.plist and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPad.storyboardc/UIViewController-qCV-AS-rCm.nib b/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPad.storyboardc/UIViewController-qCV-AS-rCm.nib
deleted file mode 100644
index 168e87b22..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPad.storyboardc/UIViewController-qCV-AS-rCm.nib and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPad.storyboardc/qCV-AS-rCm-view-Thv-qS-DhF.nib b/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPad.storyboardc/qCV-AS-rCm-view-Thv-qS-DhF.nib
deleted file mode 100644
index 1b872f7a7..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPad.storyboardc/qCV-AS-rCm-view-Thv-qS-DhF.nib and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPhone.storyboardc/2-view-3.nib b/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPhone.storyboardc/2-view-3.nib
deleted file mode 100644
index fe94c5b97..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPhone.storyboardc/2-view-3.nib and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPhone.storyboardc/Info.plist b/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPhone.storyboardc/Info.plist
deleted file mode 100644
index 4254a33d2..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPhone.storyboardc/Info.plist and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPhone.storyboardc/UIViewController-2.nib b/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPhone.storyboardc/UIViewController-2.nib
deleted file mode 100644
index c9d4126dd..000000000
Binary files a/out/production/java-client/io/appium/java_client/WebViewApp.app/en.lproj/MainStoryboard_iPhone.storyboardc/UIViewController-2.nib and /dev/null differ
diff --git a/out/production/java-client/io/appium/java_client/selendroid-test-app-0.9.0.apk b/out/production/java-client/io/appium/java_client/selendroid-test-app-0.9.0.apk
deleted file mode 100644
index a7b39a96c..000000000
Binary files a/out/production/java-client/io/appium/java_client/selendroid-test-app-0.9.0.apk and /dev/null differ
diff --git a/test/io/appium/java_client/ContextTest.java b/test/io/appium/java_client/ContextTest.java
index 5cb589fe9..85468b70f 100644
--- a/test/io/appium/java_client/ContextTest.java
+++ b/test/io/appium/java_client/ContextTest.java
@@ -49,6 +49,7 @@ public void testGetContextHandles() {
 
   @Test
   public void testSwitchContext() {
+    driver.getContextHandles();
     driver.context("WEBVIEW_1");
     assertEquals(driver.getContext(), "WEBVIEW_1");
   }