Cleaned up Ember Setup