diff --git a/.gitignore b/.gitignore
index 86bb4f1a5..76a6c0709 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,26 +3,10 @@
 .DS_Store
 npm*.log
 node_modules
+sample-code
 *.trace
 xcuserdata
-sample-code/examples
-sample-code/apps/TestApp/build
-sample-code/apps/WebViewApp/build
-sample-code/apps/WebViewApp/WebViewApp.xcodeproj/project.xcworkspace/xcshareddata
-sample-code/apps/gps-demo*
-sample-code/apps/*.apk
 *.sublime-*
-sample-code/apps/UICatalog*
-sample-code/apps/io.appium.gappium*
-sample-code/apps/WebViewDemo*
-sample-code/examples/dotnet/SimpleTest/*.userprefs
-sample-code/examples/java/junit/target/
-sample-code/examples/java/testng/target/
-sample-code/examples/python/*.pyc
-sample-code/examples/php/composer.lock
-sample-code/examples/php/composer.phar
-sample-code/examples/php/vendor
-sample-code/examples/ruby/Gemfile.lock
 test/functional/_joined
 *.iml
 *.autosave
@@ -33,7 +17,6 @@ lib/devices/android/bootstrap/local.properties
 lib/devices/android/bootstrap/project.properties
 lib/devices/android/bootstrap/.classpath
 lib/devices/android/bootstrap/target/
-sample-code/apps/ApiDemos
 .*~
 *~
 org.eclipse.ltk.core.refactoring.prefs
@@ -44,4 +27,3 @@ build/
 lib/devices/ios/uiauto/lib/status.js
 lib/devices/ios/uiauto/appium/xpath.js
 *DerivedData
-sample-code/examples/ruby/pretty_app.png