diff --git a/.gitignore b/.gitignore
index e32d4f264..904ce1761 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .DS_Store
 node_modules
 package-lock.json
+sample-code
 *.trace
 xcuserdata
 *.sublime-*
@@ -33,4 +34,3 @@ old
 .tern-project
 coverage
 docs/mkdocs.yml
-sample-code/javascript-wd/node_modules
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
index 8da26d819..66a168906 100644
--- a/.npmignore
+++ b/.npmignore
@@ -14,4 +14,3 @@ _vimrc_local.vim
 *.prefs
 ./.npmignore
 coverage
-sample-code/
\ No newline at end of file
diff --git a/sample-code/apps/ApiDemos-debug.apk b/sample-code/apps/ApiDemos-debug.apk
deleted file mode 100644
index 62a1fd607..000000000
Binary files a/sample-code/apps/ApiDemos-debug.apk and /dev/null differ
diff --git a/sample-code/apps/TestApp.app.zip b/sample-code/apps/TestApp.app.zip
deleted file mode 100644
index 52e4c2155..000000000
Binary files a/sample-code/apps/TestApp.app.zip and /dev/null differ
diff --git a/sample-code/csharp/README.md b/sample-code/csharp/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/sample-code/java/README.md b/sample-code/java/README.md
deleted file mode 100644
index f97fddae2..000000000
--- a/sample-code/java/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Java Sample Code
-
-## Setup
-
-* <Setup instructions>
\ No newline at end of file
diff --git a/sample-code/javascript-wd/.babelrc b/sample-code/javascript-wd/.babelrc
deleted file mode 100644
index bcb6ee8de..000000000
--- a/sample-code/javascript-wd/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "presets": ["es2015", "stage-0"]
-}
\ No newline at end of file
diff --git a/sample-code/javascript-wd/README.md b/sample-code/javascript-wd/README.md
deleted file mode 100644
index a8ccadf33..000000000
--- a/sample-code/javascript-wd/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Javascript WD Client Sample Code
-
-## Setup
-
-* <Setup instructions>
\ No newline at end of file
diff --git a/sample-code/javascript-wd/package.json b/sample-code/javascript-wd/package.json
deleted file mode 100644
index 178ae4c0d..000000000
--- a/sample-code/javascript-wd/package.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "javascript-wd",
-  "version": "1.0.0",
-  "description": "Appium sample code using 'wd'",
-  "scripts": {
-    "test": "mocha test/**/*.test.js"
-  },
-  "author": "Dan Graham",
-  "license": "Apache-2.0",
-  "devDependencies": {
-    "babel-core": "^6.26.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-stage-0": "^6.24.1",
-    "bluebird": "^3.5.1",
-    "chai": "^4.1.2",
-    "mocha": "^4.1.0",
-    "wd": "^1.5.0"
-  }
-}
diff --git a/sample-code/javascript-wd/test/basic/android-create-session.test.js b/sample-code/javascript-wd/test/basic/android-create-session.test.js
deleted file mode 100644
index ea0b7bb38..000000000
--- a/sample-code/javascript-wd/test/basic/android-create-session.test.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import wd from 'wd';
-import chai from 'chai';
-import { iosCaps, androidCaps, serverConfig } from '../helpers/caps';
-
-const {assert} = chai;
-
-describe('Create Android session', function () {
-  it('should create and destroy Android sessions', async function () {
-    // Connect to Appium server
-    const driver = await wd.promiseChainRemote(serverConfig);
-
-    // We haven't started a session yet, so we shouldn't see any sessions running
-    assert.equal((await driver.sessions()).length, 0);
-
-    // Start the session
-    await driver.init({
-      ...androidCaps,
-      app: require('../helpers/apps').androidApiDemos
-    });
-
-    // Now that session is running, check that 'sessions' length is one
-    assert.equal((await driver.sessions()).length, 1);
-
-    // Check that we're running the ApiDemos app by checking package and activity
-    const activity = await driver.getCurrentActivity();
-    const pkg = await driver.getCurrentPackage();
-    assert.equal(`${pkg}${activity}`, 'io.appium.android.apis.ApiDemos');
-
-    // Quit the session
-    await driver.quit();
-
-    // Session is closed, so we should be back to having no sessions
-    assert.equal((await driver.sessions()).length, 0);
-  });
-});
\ No newline at end of file
diff --git a/sample-code/javascript-wd/test/basic/android-create-web-session.test.js b/sample-code/javascript-wd/test/basic/android-create-web-session.test.js
deleted file mode 100644
index cbcded3b7..000000000
--- a/sample-code/javascript-wd/test/basic/android-create-web-session.test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import wd from 'wd';
-import chai from 'chai';
-import { androidCaps, serverConfig } from '../helpers/caps';
-
-const {assert} = chai;
-
-describe('Create Chrome web session', function () {
-  it('should create and destroy Android browser session', async function () {
-    // Connect to Appium server
-    const driver = await wd.promiseChainRemote(serverConfig);
-
-    // Start the session
-    await driver.init({
-      ...androidCaps,
-      browserName: 'Chrome'
-    });
-
-    // Navigate to google.com
-    await driver.get('https://www.google.com');
-
-    // Test that it was successful by checking the document title
-    const pageTitle = await driver.title();
-    assert.equal(pageTitle, 'Google');
-
-    // Quit the session
-    await driver.quit();
-  });
-});
\ No newline at end of file
diff --git a/sample-code/javascript-wd/test/basic/ios-basic-interactions.test.js b/sample-code/javascript-wd/test/basic/ios-basic-interactions.test.js
deleted file mode 100644
index 1ff541a82..000000000
--- a/sample-code/javascript-wd/test/basic/ios-basic-interactions.test.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import wd from 'wd';
-import chai from 'chai';
-import { iosCaps, serverConfig } from '../helpers/caps';
-
-const {assert} = chai;
-
-describe('Basic IOS interactions', function () {
-
-  let driver;
-
-  before(async function () {
-    // Connect to Appium server
-    driver = await wd.promiseChainRemote(serverConfig);
-
-    // Start the session
-    await driver.init({
-      ...iosCaps,
-      app: require('../helpers/apps').iosTestApp
-    });
-  });
-
-  after(async function () {
-    await driver.quit();
-  });
-
-  it('should send keys to inputs', async function () {
-    // Find TextField input element
-    const textInputId = `TextField1`;
-    await driver.waitForElementByAccessibilityId(textInputId);
-    const textViewsEl = await driver.elementByAccessibilityId(textInputId);
-
-    // Check that it doesn't have a value
-    let value = await textViewsEl.getValue();
-    assert.isNull(value, 'Input should have no value');
-
-    // Send keys to that input
-    await textViewsEl.sendKeys('Hello World!');
-
-    // Check that the input has new value
-    value = await textViewsEl.getValue();
-    assert.equal(value, 'Hello World!', 'Input should have newly input value');
-  });
-
-  it('should click a button that opens an alert', async function () {
-    // Find Button element and click on it
-    const buttonElementId = `show alert`;
-    await driver.waitForElementByAccessibilityId(buttonElementId);
-    const buttonElement = await driver.elementByAccessibilityId(buttonElementId);
-    await buttonElement.click();
-
-    // Wait for the alert to show up
-    const alertTitleId = `Cool title`;
-    await driver.waitForElementByAccessibilityId(alertTitleId);
-    const alertTitleElement = await driver.elementByAccessibilityId(alertTitleId);
-
-    // Check the text
-    const alertTitle = await alertTitleElement.text();
-    assert.equal(alertTitle, `Cool title`);
-  });
-});
\ No newline at end of file
diff --git a/sample-code/javascript-wd/test/basic/ios-create-session.test.js b/sample-code/javascript-wd/test/basic/ios-create-session.test.js
deleted file mode 100644
index 21d5857ff..000000000
--- a/sample-code/javascript-wd/test/basic/ios-create-session.test.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import wd from 'wd';
-import chai from 'chai';
-import { iosCaps, serverConfig } from '../helpers/caps';
-
-const {assert} = chai;
-
-describe('Create session', function () {
-  it('should create and destroy IOS sessions', async function () {
-    // Connect to Appium server
-    const driver = await wd.promiseChainRemote(serverConfig);
-
-    // We haven't started a session yet, so we shouldn't see any sessions running
-    assert.equal((await driver.sessions()).length, 0);
-
-    // Start the session
-    await driver.init({
-      ...iosCaps,
-      app: require('../helpers/apps').iosTestApp
-    });
-
-    // Now that session is running, check that 'sessions' length is one
-    assert.equal((await driver.sessions()).length, 1);
-
-    // Check that the XCUIElementTypeApplication was what we expect it to be
-    const applicationElement = await driver.elementByClassName('XCUIElementTypeApplication');
-    const applicationName = await applicationElement.getAttribute('name');
-    assert.equal(applicationName, 'TestApp');
-
-    // Quit the session
-    await driver.quit();
-
-    // Session is closed, so we should be back to having no sessions
-    assert.equal((await driver.sessions()).length, 0);
-  });
-});
\ No newline at end of file
diff --git a/sample-code/javascript-wd/test/basic/ios-create-web-session.test.js b/sample-code/javascript-wd/test/basic/ios-create-web-session.test.js
deleted file mode 100644
index 0c0785d85..000000000
--- a/sample-code/javascript-wd/test/basic/ios-create-web-session.test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import wd from 'wd';
-import chai from 'chai';
-import { iosCaps, serverConfig } from '../helpers/caps';
-
-const {assert} = chai;
-
-describe('Create Safari session', function () {
-  it('should create and destroy IOS Safari session', async function () {
-    // Connect to Appium server
-    const driver = await wd.promiseChainRemote(serverConfig);
-
-    // Start the session
-    await driver.init({
-      ...iosCaps,
-      browserName: 'Safari'
-    });
-
-    // Navigate to google.com
-    await driver.get('https://www.google.com');
-
-    // Test that it was successful by checking the document title
-    const pageTitle = await driver.title();
-    assert.equal(pageTitle, 'Google');
-
-    // Quit the session
-    await driver.quit();
-  });
-});
\ No newline at end of file
diff --git a/sample-code/javascript-wd/test/helpers/apps.js b/sample-code/javascript-wd/test/helpers/apps.js
deleted file mode 100644
index 0834bbff6..000000000
--- a/sample-code/javascript-wd/test/helpers/apps.js
+++ /dev/null
@@ -1,8 +0,0 @@
-if (process.env.DEV) {
-  // TODO: Change thes URL's to updated locations
-  exports.iosTestApp = "http://appium.github.io/appium/assets/TestApp7.1.app.zip";
-  exports.androidApiDemos = "http://appium.github.io/appium/assets/ApiDemos-debug.apk";
-} else {
-  exports.iosTestApp = "sample-code/apps/TestApp.app.zip";
-  exports.androidApiDemos = "sample-code/apps/ApiDemos-debug.apk";
-}
diff --git a/sample-code/javascript-wd/test/helpers/caps.js b/sample-code/javascript-wd/test/helpers/caps.js
deleted file mode 100644
index 55ac25883..000000000
--- a/sample-code/javascript-wd/test/helpers/caps.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import path from 'path';
-
-const iosCaps = {
-  platformName: 'iOS',
-  automationName: 'XCUITest',
-  deviceName:  process.env.IOS_DEVICE_NAME || 'iPhone 6s',
-  platformVersion: process.env.IOS_PLATFORM_VERSION || '11.1',
-  app: undefined, // Will be added in tests
-};
-
-// Leave the Android platformVersion blank and set deviceName to a random string (Android deviceName is ignored by Appium but is still required)
-// If we're using SauceLabs, set the Android deviceName and platformVersion to the latest supported SauceLabs device and version
-const DEFAULT_ANDROID_DEVICE_NAME = process.env.SAUCE ? 'Android GoogleAPI Emulator' : 'My Android Device';
-const DEFAULT_ANDROID_PLATFORM_VERSION = process.env.SAUCE ? '7.1' : null;
-
-const androidCaps = {
-  platformName: 'Android',
-  automationName: 'UiAutomator2',
-  deviceName: process.env.ANDROID_DEVICE_NAME || DEFAULT_ANDROID_DEVICE_NAME,
-  platformVersion: process.env.ANDROID_PLATFORM_VERSION || DEFAULT_ANDROID_PLATFORM_VERSION,
-  app: undefined, // Will be added in tests
-};
-
-const serverConfig = {
-  host: process.env.APPIUM_HOST || 'localhost',
-  port: process.env.APPIUM_PORT || 4723
-};
-
-export { iosCaps, androidCaps, serverConfig };
\ No newline at end of file
diff --git a/sample-code/javascript-wd/test/mocha.opts b/sample-code/javascript-wd/test/mocha.opts
deleted file mode 100644
index f4b58555b..000000000
--- a/sample-code/javascript-wd/test/mocha.opts
+++ /dev/null
@@ -1,3 +0,0 @@
---compilers babel-core/register
---require babel-polyfill
---timeout 1800000
\ No newline at end of file
diff --git a/sample-code/javascript-webdriverio/README.md b/sample-code/javascript-webdriverio/README.md
deleted file mode 100644
index 6501f4c22..000000000
--- a/sample-code/javascript-webdriverio/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# WebdriverIO Sample Code
-
-## Setup
-
-* <Setup instructions>
\ No newline at end of file
diff --git a/sample-code/php/README.md b/sample-code/php/README.md
deleted file mode 100644
index f2c4d39d7..000000000
--- a/sample-code/php/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# PHP Sample Code
-
-## Setup
-
-* <Setup instructions>
\ No newline at end of file
diff --git a/sample-code/python/README.md b/sample-code/python/README.md
deleted file mode 100644
index 5043584e8..000000000
--- a/sample-code/python/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Python Sample Code
-
-## Setup
-
-* <Setup instructions>
\ No newline at end of file
diff --git a/sample-code/ruby/README.md b/sample-code/ruby/README.md
deleted file mode 100644
index 3693c6874..000000000
--- a/sample-code/ruby/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Ruby Sample Code
-
-## Setup
-
-* <Setup instructions>
\ No newline at end of file