diff --git a/CHANGES.md b/CHANGES.md
index 61b1eb5fc10f..1bfcd4e40589 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,9 +10,6 @@ Change Log
    * `Cesium3DTileContent`
    * `Cesium3DTileFeature`
 
-TODO: these are still private:
-* Added `vertexShaderLoaded`, `fragmentShaderLoaded`, `uniformMapLoaded`, `pickVertexShaderLoaded`, `pickFragmentShaderLoaded`, and `pickUniformMapLoaded` callbacks to the `Model` constructor and `Model.fromGltf`.
-
 TODO: this is not finished yet:
 * Added support for glTF compression using the `mesh_compression_open3dgc` glTF extension.
 
diff --git a/Source/Scene/Batched3DModel3DTileContent.js b/Source/Scene/Batched3DModel3DTileContent.js
index cb2105652561..be3faf3b4ccf 100644
--- a/Source/Scene/Batched3DModel3DTileContent.js
+++ b/Source/Scene/Batched3DModel3DTileContent.js
@@ -202,7 +202,7 @@ define([
         var gltfView = new Uint8Array(arrayBuffer, byteOffset, gltfByteLength);
 
         // PERFORMANCE_IDEA: patch the shader on demand, e.g., the first time show/color changes.
-        // The pitch shader still needs to be patched.
+        // The pick shader still needs to be patched.
         var model = new Model({
             gltf : gltfView,
             cull : false,           // The model is already culled by the 3D tiles
diff --git a/Source/Scene/Cesium3DTile.js b/Source/Scene/Cesium3DTile.js
index 789fe51d36dc..b64f4fdaee3b 100644
--- a/Source/Scene/Cesium3DTile.js
+++ b/Source/Scene/Cesium3DTile.js
@@ -84,9 +84,6 @@ define([
 
         this._boundingVolume = createBoundingVolume(header.boundingVolume);
 
-// TODO: if the content type has pixel size, like points or billboards, the bounding volume needs
-// to dynamic size bigger like BillboardCollection and PointCollection
-
         var contentBoundingVolume;
 
         if (defined(contentHeader) && defined(contentHeader.boundingVolume)) {
diff --git a/Source/Scene/Cesium3DTileStyle.js b/Source/Scene/Cesium3DTileStyle.js
index 0ff7ee7da524..644cdda0b9a3 100644
--- a/Source/Scene/Cesium3DTileStyle.js
+++ b/Source/Scene/Cesium3DTileStyle.js
@@ -29,10 +29,8 @@ define([
     var DEFAULT_JSON_BOOLEAN_EXPRESSION = true;
 
     /**
-     * <p>
      * Evaluates an expression defined using the
      * {@link https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/master/Styling|3D Tiles Styling language}.
-     * </p>
      *
      * @alias Cesium3DTileStyle
      * @constructor
diff --git a/Source/Scene/Cesium3DTileset.js b/Source/Scene/Cesium3DTileset.js
index a1a3162d0598..e0c9c1ea3dda 100644
--- a/Source/Scene/Cesium3DTileset.js
+++ b/Source/Scene/Cesium3DTileset.js
@@ -834,7 +834,7 @@ define([
 
             // Tile is inside/intersects the view frustum.  How many pixels is its geometric error?
             var sse = getScreenSpaceError(t.geometricError, t, frameState);
-// TODO: refine also based on (1) occlusion/VMSSE and/or (2) center of viewport
+            // PERFORMANCE_IDEA: refine also based on (1) occlusion/VMSSE and/or (2) center of viewport
 
             var children = t.children;
             var childrenLength = children.length;
@@ -864,7 +864,6 @@ define([
                 // regardless of if its SSE is sufficient.
                 selectTile(tileset, t, fullyVisible, frameState);
 
-// TODO: experiment with prefetching children
                 if (sse > maximumScreenSpaceError) {
                     // Tile does not meet SSE. Refine them in front-to-back order.
 
@@ -877,8 +876,6 @@ define([
 
                         // Sort children by distance for (1) request ordering, and (2) early-z
                         children.sort(sortChildrenByDistanceToCamera);
-// TODO: is pixel size better?
-// TODO: consider priority queue instead of explicit sort, which would no longer be DFS.
 
                         // With additive refinement, we only request children that are visible, compared
                         // to replacement refinement where we need all children.
diff --git a/Source/Scene/ConditionsExpression.js b/Source/Scene/ConditionsExpression.js
index cc0c4fb86edb..3a6e85f7b8cb 100644
--- a/Source/Scene/ConditionsExpression.js
+++ b/Source/Scene/ConditionsExpression.js
@@ -18,10 +18,8 @@ define([
     var expressionPlaceholder = /\$\{expression}/g;
 
     /**
-     * <p>
      * Evaluates a conditions expression defined using the
      * {@link https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/master/Styling|3D Tiles Styling language}.
-     * </p>
      * <p>
      * Implements the {@link StyleExpression} interface.
      * </p>
diff --git a/Source/Scene/Expression.js b/Source/Scene/Expression.js
index 37d37b2e8a76..84db81ac906d 100644
--- a/Source/Scene/Expression.js
+++ b/Source/Scene/Expression.js
@@ -26,10 +26,8 @@ define([
     var scratchColor = new Color();
 
     /**
-     * <p>
      * Evaluates an expression defined using the
      * {@link https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/master/Styling|3D Tiles Styling language}.
-     * </p>
      * <p>
      * Implements the {@link StyleExpression} interface.
      * </p>