More removal of Ember-Data