diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js
index 2fcb1c9e..9aa36b8e 100644
--- a/lib/jasmine-core/jasmine.js
+++ b/lib/jasmine-core/jasmine.js
@@ -726,30 +726,11 @@ getJasmineRequireObj().util = function(j$) {
 };
 
 getJasmineRequireObj().Spec = function(j$) {
-  /**
-   * @interface Spec
-   * @see Configuration#specFilter
-   * @since 2.0.0
-   */
   function Spec(attrs) {
     this.expectationFactory = attrs.expectationFactory;
     this.asyncExpectationFactory = attrs.asyncExpectationFactory;
     this.resultCallback = attrs.resultCallback || function() {};
-    /**
-     * The unique ID of this spec.
-     * @name Spec#id
-     * @readonly
-     * @type {string}
-     * @since 2.0.0
-     */
     this.id = attrs.id;
-    /**
-     * The description passed to the {@link it} that created this spec.
-     * @name Spec#description
-     * @readonly
-     * @type {string}
-     * @since 2.0.0
-     */
     this.description = attrs.description || '';
     this.queueableFn = attrs.queueableFn;
     this.beforeAndAfterFns =
@@ -1005,13 +986,6 @@ getJasmineRequireObj().Spec = function(j$) {
     return 'passed';
   };
 
-  /**
-   * The full description including all ancestors of this spec.
-   * @name Spec#getFullName
-   * @function
-   * @returns {string}
-   * @since 2.0.0
-   */
   Spec.prototype.getFullName = function() {
     return this.getSpecName(this);
   };
@@ -1064,6 +1038,7 @@ getJasmineRequireObj().Spec = function(j$) {
   /**
    * @interface Spec
    * @see Configuration#specFilter
+   * @since 2.0.0
    */
   Object.defineProperty(Spec.prototype, 'metadata', {
     get: function() {
@@ -1074,6 +1049,7 @@ getJasmineRequireObj().Spec = function(j$) {
            * @name Spec#id
            * @readonly
            * @type {string}
+           * @since 2.0.0
            */
           id: this.id,
 
@@ -1082,6 +1058,7 @@ getJasmineRequireObj().Spec = function(j$) {
            * @name Spec#description
            * @readonly
            * @type {string}
+           * @since 2.0.0
            */
           description: this.description,
 
@@ -1090,6 +1067,7 @@ getJasmineRequireObj().Spec = function(j$) {
            * @name Spec#getFullName
            * @function
            * @returns {string}
+           * @since 2.0.0
            */
           getFullName: this.getFullName.bind(this)
         };
@@ -9634,29 +9612,10 @@ getJasmineRequireObj().StackTrace = function(j$) {
 };
 
 getJasmineRequireObj().Suite = function(j$) {
-  /**
-   * @interface Suite
-   * @see Env#topSuite
-   * @since 2.0.0
-   */
   function Suite(attrs) {
     this.env = attrs.env;
-    /**
-     * The unique ID of this suite.
-     * @name Suite#id
-     * @readonly
-     * @type {string}
-     * @since 2.0.0
-     */
     this.id = attrs.id;
     this.parentSuite = attrs.parentSuite;
-    /**
-     * The description passed to the {@link describe} that created this suite.
-     * @name Suite#description
-     * @readonly
-     * @type {string}
-     * @since 2.0.0
-     */
     this.description = attrs.description;
     this.expectationFactory = attrs.expectationFactory;
     this.asyncExpectationFactory = attrs.asyncExpectationFactory;
@@ -9670,13 +9629,6 @@ getJasmineRequireObj().Suite = function(j$) {
     this.beforeAllFns = [];
     this.afterAllFns = [];
     this.timer = attrs.timer || new j$.Timer();
-
-    /**
-     * The suite's children.
-     * @name Suite#children
-     * @type {Array.<(Spec|Suite)>}
-     * @since 2.0.0
-     */
     this.children = [];
 
     this.reset();
@@ -9695,13 +9647,6 @@ getJasmineRequireObj().Suite = function(j$) {
     return this.asyncExpectationFactory(actual, this);
   };
 
-  /**
-   * The full description including all ancestors of this suite.
-   * @name Suite#getFullName
-   * @function
-   * @returns {string}
-   * @since 2.0.0
-   */
   Suite.prototype.getFullName = function() {
     var fullName = [];
     for (
@@ -9925,6 +9870,7 @@ getJasmineRequireObj().Suite = function(j$) {
   /**
    * @interface Suite
    * @see Env#topSuite
+   * @since 2.0.0
    */
   function SuiteMetadata(suite) {
     this.suite_ = suite;
@@ -9933,6 +9879,7 @@ getJasmineRequireObj().Suite = function(j$) {
      * @name Suite#id
      * @readonly
      * @type {string}
+     * @since 2.0.0
      */
     this.id = suite.id;
 
@@ -9949,6 +9896,7 @@ getJasmineRequireObj().Suite = function(j$) {
      * @name Suite#description
      * @readonly
      * @type {string}
+     * @since 2.0.0
      */
     this.description = suite.description;
   }
@@ -9958,6 +9906,7 @@ getJasmineRequireObj().Suite = function(j$) {
    * @name Suite#getFullName
    * @function
    * @returns {string}
+   * @since 2.0.0
    */
   SuiteMetadata.prototype.getFullName = function() {
     return this.suite_.getFullName();
@@ -9967,6 +9916,7 @@ getJasmineRequireObj().Suite = function(j$) {
    * The suite's children.
    * @name Suite#children
    * @type {Array.<(Spec|Suite)>}
+   * @since 2.0.0
    */
   Object.defineProperty(SuiteMetadata.prototype, 'children', {
     get: function() {
diff --git a/src/core/Spec.js b/src/core/Spec.js
index 6747604d..6e767fbf 100644
--- a/src/core/Spec.js
+++ b/src/core/Spec.js
@@ -1,28 +1,9 @@
 getJasmineRequireObj().Spec = function(j$) {
-  /**
-   * @interface Spec
-   * @see Configuration#specFilter
-   * @since 2.0.0
-   */
   function Spec(attrs) {
     this.expectationFactory = attrs.expectationFactory;
     this.asyncExpectationFactory = attrs.asyncExpectationFactory;
     this.resultCallback = attrs.resultCallback || function() {};
-    /**
-     * The unique ID of this spec.
-     * @name Spec#id
-     * @readonly
-     * @type {string}
-     * @since 2.0.0
-     */
     this.id = attrs.id;
-    /**
-     * The description passed to the {@link it} that created this spec.
-     * @name Spec#description
-     * @readonly
-     * @type {string}
-     * @since 2.0.0
-     */
     this.description = attrs.description || '';
     this.queueableFn = attrs.queueableFn;
     this.beforeAndAfterFns =
@@ -278,13 +259,6 @@ getJasmineRequireObj().Spec = function(j$) {
     return 'passed';
   };
 
-  /**
-   * The full description including all ancestors of this spec.
-   * @name Spec#getFullName
-   * @function
-   * @returns {string}
-   * @since 2.0.0
-   */
   Spec.prototype.getFullName = function() {
     return this.getSpecName(this);
   };
@@ -337,6 +311,7 @@ getJasmineRequireObj().Spec = function(j$) {
   /**
    * @interface Spec
    * @see Configuration#specFilter
+   * @since 2.0.0
    */
   Object.defineProperty(Spec.prototype, 'metadata', {
     get: function() {
@@ -347,6 +322,7 @@ getJasmineRequireObj().Spec = function(j$) {
            * @name Spec#id
            * @readonly
            * @type {string}
+           * @since 2.0.0
            */
           id: this.id,
 
@@ -355,6 +331,7 @@ getJasmineRequireObj().Spec = function(j$) {
            * @name Spec#description
            * @readonly
            * @type {string}
+           * @since 2.0.0
            */
           description: this.description,
 
@@ -363,6 +340,7 @@ getJasmineRequireObj().Spec = function(j$) {
            * @name Spec#getFullName
            * @function
            * @returns {string}
+           * @since 2.0.0
            */
           getFullName: this.getFullName.bind(this)
         };
diff --git a/src/core/Suite.js b/src/core/Suite.js
index 4d7b1f30..84d7e770 100644
--- a/src/core/Suite.js
+++ b/src/core/Suite.js
@@ -1,27 +1,8 @@
 getJasmineRequireObj().Suite = function(j$) {
-  /**
-   * @interface Suite
-   * @see Env#topSuite
-   * @since 2.0.0
-   */
   function Suite(attrs) {
     this.env = attrs.env;
-    /**
-     * The unique ID of this suite.
-     * @name Suite#id
-     * @readonly
-     * @type {string}
-     * @since 2.0.0
-     */
     this.id = attrs.id;
     this.parentSuite = attrs.parentSuite;
-    /**
-     * The description passed to the {@link describe} that created this suite.
-     * @name Suite#description
-     * @readonly
-     * @type {string}
-     * @since 2.0.0
-     */
     this.description = attrs.description;
     this.expectationFactory = attrs.expectationFactory;
     this.asyncExpectationFactory = attrs.asyncExpectationFactory;
@@ -35,13 +16,6 @@ getJasmineRequireObj().Suite = function(j$) {
     this.beforeAllFns = [];
     this.afterAllFns = [];
     this.timer = attrs.timer || new j$.Timer();
-
-    /**
-     * The suite's children.
-     * @name Suite#children
-     * @type {Array.<(Spec|Suite)>}
-     * @since 2.0.0
-     */
     this.children = [];
 
     this.reset();
@@ -60,13 +34,6 @@ getJasmineRequireObj().Suite = function(j$) {
     return this.asyncExpectationFactory(actual, this);
   };
 
-  /**
-   * The full description including all ancestors of this suite.
-   * @name Suite#getFullName
-   * @function
-   * @returns {string}
-   * @since 2.0.0
-   */
   Suite.prototype.getFullName = function() {
     var fullName = [];
     for (
@@ -290,6 +257,7 @@ getJasmineRequireObj().Suite = function(j$) {
   /**
    * @interface Suite
    * @see Env#topSuite
+   * @since 2.0.0
    */
   function SuiteMetadata(suite) {
     this.suite_ = suite;
@@ -298,6 +266,7 @@ getJasmineRequireObj().Suite = function(j$) {
      * @name Suite#id
      * @readonly
      * @type {string}
+     * @since 2.0.0
      */
     this.id = suite.id;
 
@@ -314,6 +283,7 @@ getJasmineRequireObj().Suite = function(j$) {
      * @name Suite#description
      * @readonly
      * @type {string}
+     * @since 2.0.0
      */
     this.description = suite.description;
   }
@@ -323,6 +293,7 @@ getJasmineRequireObj().Suite = function(j$) {
    * @name Suite#getFullName
    * @function
    * @returns {string}
+   * @since 2.0.0
    */
   SuiteMetadata.prototype.getFullName = function() {
     return this.suite_.getFullName();
@@ -332,6 +303,7 @@ getJasmineRequireObj().Suite = function(j$) {
    * The suite's children.
    * @name Suite#children
    * @type {Array.<(Spec|Suite)>}
+   * @since 2.0.0
    */
   Object.defineProperty(SuiteMetadata.prototype, 'children', {
     get: function() {