Drop characteristic types

app/pods/protected/characteristics/controller.js

@@ -2,5 +2,5 @@ import Ember from 'ember';
 
 export default Ember.Controller.extend({
   sortParams: ['characteristicType.characteristicTypeName', 'sortOrder'],
-  sortedCharacteristics: Ember.computed.sort('characteristics', 'sortParams'),
+  sortedCharacteristics: Ember.computed.sort('model', 'sortParams'),
 });

app/pods/protected/characteristics/route.js

@@ -3,13 +3,7 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi
 
 export default Ember.Route.extend(AuthenticatedRouteMixin, {
   model: function() {
-    return Ember.RSVP.hash({
-      characteristicTypes: this.store.findAll('characteristic-type'),
-      characteristics: this.store.findAll('characteristic'),
-    });
+    return this.store.findAll('characteristic');
   },
 
-  setupController: function(controller, models) {
-    controller.setProperties(models);
-  },
 });

app/pods/protected/characteristics/template.hbs

@@ -1,5 +1,5 @@
 <h2>{{genus-name}} Characteristics</h2>
-<h3>Total characteristics: {{characteristics.length}}</h3>
+<h3>Total characteristics: {{model.length}}</h3>
 
 <table class="flakes-table">
   <thead>