diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc
index b52b438ae1a1..980f2641e502 100644
--- a/atom/common/api/atom_api_native_image.cc
+++ b/atom/common/api/atom_api_native_image.cc
@@ -517,9 +517,6 @@ mate::Handle<NativeImage> NativeImage::CreateFromBuffer(
     options.Get("width", &width);
     options.Get("height", &height);
     options.Get("scaleFactor", &scale_factor);
-  } else {
-    // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
-    args->GetNext(&scale_factor);
   }
 
   gfx::ImageSkia image_skia;
diff --git a/docs/api/native-image.md b/docs/api/native-image.md
index f1d9e5ce284a..7f2aaecf8e19 100644
--- a/docs/api/native-image.md
+++ b/docs/api/native-image.md
@@ -137,7 +137,7 @@ let image = nativeImage.createFromPath('/Users/somebody/images/icon.png')
 console.log(image)
 ```
 
-### `nativeImage.createFromBuffer(buffer[, options])`
+### `nativeImage.createFromBuffer(buffer, options)`
 
 * `buffer` [Buffer][buffer]
 * `options` Object (optional)
diff --git a/docs/tutorial/planned-breaking-changes.md b/docs/tutorial/planned-breaking-changes.md
index 3af50e26469f..a0ec132a9942 100644
--- a/docs/tutorial/planned-breaking-changes.md
+++ b/docs/tutorial/planned-breaking-changes.md
@@ -40,15 +40,6 @@ ses.setCertificateVerifyProc(function (request, callback) {
 })
 ```
 
-## `webFrame`
-
-```js
-// Deprecated
-webFrame.registerURLSchemeAsPrivileged('app', {secure: true})
-// Replace with
-protocol.registerStandardSchemes(['app'], {secure: true})
-```
-
 ## Node Headers URL
 
 This is the URL specified as `disturl` in a `.npmrc` file or as the `--dist-url`
@@ -71,6 +62,17 @@ The following list includes the APIs that will be removed in Electron 4.0.
 There is no timetable for when this release will occur but deprecation
 warnings will be added at least [one major version](electron-versioning.md#semver) beforehand.
 
+## `webFrame`
+
+```js
+// Deprecated
+webFrame.registerURLSchemeAsPrivileged('app', {secure: true})
+// Replace with
+protocol.registerStandardSchemes(['app'], {secure: true})
+```
+
+*Nota Bene:* Before we can remove this we need to update all of the relevant specs to `protocol.registerStandardSchemes(['app'], {secure: true})`.
+
 ## `app.makeSingleInstance`
 
 ```js