--- a/testing/marionette/evaluate.js
+++ b/testing/marionette/evaluate.js
@@ -37,25 +37,25 @@ this.evaluate = {};
  *
  * The the provided `script` will be wrapped in an anonymous function
  * with the `args` argument applied.
  *
  * The arguments provided by the `args<` argument are exposed
  * through the `arguments` object available in the script context,
  * and if the script is executed asynchronously with the `async`
  * option, an additional last argument that is synonymous to the
- * `????????` global is appended, and can be accessed
+ * name `resolve` is appended, and can be accessed
  * through `arguments[arguments.length - 1]`.
  *
  * The `timeout` option specifies the duration for how long the
  * script should be allowed to run before it is interrupted and aborted.
  * An interrupted script will cause a {@link ScriptTimeoutError} to occur.
  *
  * The `async` option indicates that the script will not return
- * until the `????????` global callback is invoked,
+ * until the `resolve` callback is invoked,
  * which is analogous to the last argument of the `arguments` object.
  *
  * The `file` option is used in error messages to provide information
  * on the origin script file in the local end.
  *
  * The `line` option is used in error messages, along with `filename`,
  * to provide the line number in the origin script file on the local end.
  *
@@ -67,19 +67,16 @@ this.evaluate = {};
  *     A sequence of arguments to call the script with.
  * @param {boolean=} [async=false] async
  *     Indicates if the script should return immediately or wait for
  *     the callback to be invoked before returning.
  * @param {string=} [file="dummy file"] file
  *     File location of the program in the client.
  * @param {number=} [line=0] line
  *     Line number of th eprogram in the client.
- * @param {string=} sandboxName
- *     Name of the sandbox.  Elevated system privileges, equivalent to
- *     chrome space, will be given if it is <tt>system</tt>.
  * @param {number=} [timeout=DEFAULT_TIMEOUT] timeout
  *     Duration in milliseconds before interrupting the script.
  *
  * @return {Promise}
  *     A promise that when resolved will give you the return value from
  *     the script.  Note that the return value requires serialisation before
  *     it can be sent to the client.
  *
@@ -88,17 +85,16 @@ this.evaluate = {};
  * @throws {ScriptTimeoutError}
  *   If the script was interrupted due to script timeout.
  */
 evaluate.sandbox = function(sb, script, args = [],
     {
       async = false,
       file = "dummy file",
       line = 0,
-      sandboxName = null,
       timeout = DEFAULT_TIMEOUT,
     } = {}) {
   let scriptTimeoutID, timeoutHandler, unloadHandler;
 
   let promise = new Promise((resolve, reject) => {
     let src = "";
     sb[COMPLETE] = resolve;
     timeoutHandler = () => reject(new ScriptTimeoutError(`Timed out after ${timeout} ms`));