diff --git a/lib/cylon-crazyflie.js b/lib/cylon-crazyflie.js
index 7f58b46..0b710fe 100644
--- a/lib/cylon-crazyflie.js
+++ b/lib/cylon-crazyflie.js
@@ -8,25 +8,18 @@
 
 "use strict";
 
-var Cylon = require('cylon');
-
 var Adaptor = require('./adaptor'),
     Driver = require('./driver');
 
 module.exports = {
+  adaptors: ['crazyflie'],
+  drivers: ['crazyflie'],
+
   adaptor: function(opts) {
     return new Adaptor(opts);
   },
 
   driver: function(opts) {
     return new Driver(opts);
-  },
-
-  register: function(robot) {
-    Cylon.Logger.info("Registering Crazyflie adaptor for " + robot.name);
-    robot.registerAdaptor('cylon-crazyflie', 'crazyflie');
-
-    Cylon.Logger.info("Registering Crazyflie driver for " + robot.name);
-    robot.registerDriver('cylon-crazyflie', 'crazyflie');
   }
 };
diff --git a/test/specs/cylon-crazyflie.spec.js b/test/specs/cylon-crazyflie.spec.js
index 22384e9..d7eaec4 100644
--- a/test/specs/cylon-crazyflie.spec.js
+++ b/test/specs/cylon-crazyflie.spec.js
@@ -6,27 +6,17 @@ var Adaptor = source('adaptor'),
     Driver = source('driver');
 
 describe("Cylon.Crazyflie", function() {
-  describe("#register", function() {
-    var bot, adaptor, driver;
-
-    beforeEach(function() {
-      bot = { registerAdaptor: spy(), registerDriver: spy() };
-
-      adaptor = bot.registerAdaptor;
-      driver = bot.registerDriver;
-
-      module.register(bot);
-    });
-
-    it("registers the 'crazyflie' adaptor with the robot", function() {
-      expect(adaptor).to.be.calledWith('cylon-crazyflie', 'crazyflie');
+  describe("#adaptors", function() {
+    it('is an array of supplied adaptors', function() {
+      expect(module.adaptors).to.be.eql(['crazyflie']);
     });
+  });
 
-    it("registers the 'crazyflie' driver with the robot", function() {
-      expect(driver).to.be.calledWith('cylon-crazyflie', 'crazyflie');
+  describe("#drivers", function() {
+    it('is an array of supplied drivers', function() {
+      expect(module.drivers).to.be.eql(['crazyflie']);
     });
   });
-
   describe("#adaptor", function() {
     it("returns a new instance of the Crazyflie adaptor", function() {
       expect(module.adaptor()).to.be.an.instanceOf(Adaptor);