diff --git a/.travis.yml b/.travis.yml
index 8197d31..310b7cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,17 +9,6 @@ cache:
   directories:
     - node_modules
 
-env:
-  - EMBER_TRY_SCENARIO=default
-  - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
-  - EMBER_TRY_SCENARIO=ember-canary
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - env: EMBER_TRY_SCENARIO=ember-canary
-
 before_install:
   - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
   - "npm config set spin false"
@@ -31,4 +20,4 @@ install:
   - bower install
 
 script:
-  - ember try $EMBER_TRY_SCENARIO test
+  - ember try:testall
diff --git a/addon/components/x-option.js b/addon/components/x-option.js
index c5d4d46..1c0105e 100644
--- a/addon/components/x-option.js
+++ b/addon/components/x-option.js
@@ -56,14 +56,13 @@ export default Ember.Component.extend({
     Ember.run.scheduleOnce('afterRender', this, 'registerWithXSelect');
   },
 
-  parentXSelect: Ember.computed(function() {
+  select: Ember.computed(function() {
     return this.nearestOfType(XSelectComponent);
   }),
 
   registerWithXSelect() {
-    const select = this.get('parentXSelect');
+    const select = this.get('select');
     Ember.assert("x-option component declared without enclosing x-select", !!select);
-    this.set('select', select);
     select.registerOption(this);
   },
 
diff --git a/addon/templates/current/components/x-select.hbs b/addon/templates/current/components/x-select.hbs
index af3ecc9..83ee33b 100644
--- a/addon/templates/current/components/x-select.hbs
+++ b/addon/templates/current/components/x-select.hbs
@@ -1,5 +1,5 @@
 {{yield
   (hash
-    option=(component "x-option" parentXSelect=this)
+    option=(component "x-option" select=this)
   )
 }}
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 4bd2af7..77615ed 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -2,7 +2,6 @@
 var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var semver = require('semver');
   var app = new EmberApp(defaults, {
     // Add options here
   });