diff --git a/addon/-private/core.js b/addon/-private/core.js
index abff6660a3f..05c892d99cc 100644
--- a/addon/-private/core.js
+++ b/addon/-private/core.js
@@ -17,7 +17,6 @@ import VERSION from 'ember-data/version';
   @type String
   @static
 */
-/*jshint -W079 */
 var DS = Ember.Namespace.create({
   VERSION: VERSION
 });
@@ -26,8 +25,4 @@ if (Ember.libraries) {
   Ember.libraries.registerCoreLibrary('Ember Data', DS.VERSION);
 }
 
-// var EMBER_DATA_FEATURES = EMBER_DATA_FEATURES_PLACEHOLDER; //jshint ignore: line
-
-// Ember.merge(Ember.FEATURES, EMBER_DATA_FEATURES);
-
 export default DS;
diff --git a/addon/-private/system/model/internal-model.js b/addon/-private/system/model/internal-model.js
index 944e93635dc..57b0163cd4b 100644
--- a/addon/-private/system/model/internal-model.js
+++ b/addon/-private/system/model/internal-model.js
@@ -304,6 +304,7 @@ InternalModel.prototype = {
     This method is needed when data for the internal model is pushed and the
     pushed data might acknowledge dirty attributes as confirmed.
 
+    @method updateChangedAttributes
     @private
    */
   updateChangedAttributes() {
@@ -324,6 +325,7 @@ InternalModel.prototype = {
     Returns an object, whose keys are changed properties, and value is an
     [oldProp, newProp] array.
 
+    @method changedAttributes
     @private
   */
   changedAttributes() {
diff --git a/addon/.gitkeep b/addon/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000