diff --git a/lib/modules/ens/contracts/FIFSRegistrar.sol b/lib/modules/ens/contracts/FIFSRegistrar.sol
deleted file mode 100644
index 62b7f270b..000000000
--- a/lib/modules/ens/contracts/FIFSRegistrar.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-pragma solidity ^0.4.18;
-
-import './ENS.sol';
-
-/**
- * A registrar that allocates subdomains to the first person to claim them.
- */
-contract FIFSRegistrar {
-    ENS ens;
-    bytes32 rootNode;
-
-    modifier only_owner(bytes32 subnode) {
-        address currentOwner = ens.owner(keccak256(rootNode, subnode));
-        require(currentOwner == 0 || currentOwner == msg.sender);
-        _;
-    }
-
-    /**
-     * Constructor.
-     * @param ensAddr The address of the ENS registry.
-     * @param node The node that this registrar administers.
-     */
-    function FIFSRegistrar(ENS ensAddr, bytes32 node) public {
-        ens = ensAddr;
-        rootNode = node;
-    }
-
-    /**
-     * Register a name, or change the owner of an existing registration.
-     * @param subnode The hash of the label to register.
-     * @param owner The address of the new owner.
-     */
-    function register(bytes32 subnode, address owner) public only_owner(subnode) {
-        ens.setSubnodeOwner(rootNode, subnode, owner);
-    }
-}
diff --git a/lib/modules/ens/contracts/ReverseRegistrar.sol b/lib/modules/ens/contracts/ReverseRegistrar.sol
deleted file mode 100644
index d30557292..000000000
--- a/lib/modules/ens/contracts/ReverseRegistrar.sol
+++ /dev/null
@@ -1,117 +0,0 @@
-pragma solidity ^0.4.10;
-
-import "./ENS.sol";
-
-contract Resolver {
-    function setName(bytes32 node, string name) public;
-}
-
-contract ReverseRegistrar {
-    // namehash('addr.reverse')
-    bytes32 constant ADDR_REVERSE_NODE = 0x91d1777781884d03a6757a803996e38de2a42967fb37eeaca72729271025a9e2;
-
-    ENS public ens;
-    Resolver public defaultResolver;
-
-    /**
-     * @dev Constructor
-     * @param ensAddr The address of the ENS registry.
-     * @param resolverAddr The address of the default reverse resolver.
-     */
-    function ReverseRegistrar(ENS ensAddr, Resolver resolverAddr) public {
-        ens = ensAddr;
-        defaultResolver = resolverAddr;
-
-        // Assign ownership of the reverse record to our deployer
-        ReverseRegistrar oldRegistrar = ReverseRegistrar(ens.owner(ADDR_REVERSE_NODE));
-        if (address(oldRegistrar) != 0) {
-            oldRegistrar.claim(msg.sender);
-        }
-    }
-    
-    /**
-     * @dev Transfers ownership of the reverse ENS record associated with the
-     *      calling account.
-     * @param owner The address to set as the owner of the reverse record in ENS.
-     * @return The ENS node hash of the reverse record.
-     */
-    function claim(address owner) public returns (bytes32) {
-        return claimWithResolver(owner, 0);
-    }
-
-    /**
-     * @dev Transfers ownership of the reverse ENS record associated with the
-     *      calling account.
-     * @param owner The address to set as the owner of the reverse record in ENS.
-     * @param resolver The address of the resolver to set; 0 to leave unchanged.
-     * @return The ENS node hash of the reverse record.
-     */
-    function claimWithResolver(address owner, address resolver) public returns (bytes32) {
-        var label = sha3HexAddress(msg.sender);
-        bytes32 node = keccak256(ADDR_REVERSE_NODE, label);
-        var currentOwner = ens.owner(node);
-
-        // Update the resolver if required
-        if (resolver != 0 && resolver != ens.resolver(node)) {
-            // Transfer the name to us first if it's not already
-            if (currentOwner != address(this)) {
-                ens.setSubnodeOwner(ADDR_REVERSE_NODE, label, this);
-                currentOwner = address(this);
-            }
-            ens.setResolver(node, resolver);
-        }
-
-        // Update the owner if required
-        if (currentOwner != owner) {
-            ens.setSubnodeOwner(ADDR_REVERSE_NODE, label, owner);
-        }
-
-        return node;
-    }
-
-    /**
-     * @dev Sets the `name()` record for the reverse ENS record associated with
-     * the calling account. First updates the resolver to the default reverse
-     * resolver if necessary.
-     * @param name The name to set for this address.
-     * @return The ENS node hash of the reverse record.
-     */
-    function setName(string name) public returns (bytes32) {
-        bytes32 node = claimWithResolver(this, defaultResolver);
-        defaultResolver.setName(node, name);
-        return node;
-    }
-
-    /**
-     * @dev Returns the node hash for a given account's reverse records.
-     * @param addr The address to hash
-     * @return The ENS node hash.
-     */
-    function node(address addr) public view returns (bytes32) {
-        return keccak256(ADDR_REVERSE_NODE, sha3HexAddress(addr));
-    }
-
-    /**
-     * @dev An optimised function to compute the sha3 of the lower-case
-     *      hexadecimal representation of an Ethereum address.
-     * @param addr The address to hash
-     * @return The SHA3 hash of the lower-case hexadecimal encoding of the
-     *         input address.
-     */
-    function sha3HexAddress(address addr) private returns (bytes32 ret) {
-        addr; ret; // Stop warning us about unused variables
-        assembly {
-            let lookup := 0x3031323334353637383961626364656600000000000000000000000000000000
-            let i := 40
-        loop:
-            i := sub(i, 1)
-            mstore8(i, byte(and(addr, 0xf), lookup))
-            addr := div(addr, 0x10)
-            i := sub(i, 1)
-            mstore8(i, byte(and(addr, 0xf), lookup))
-            addr := div(addr, 0x10)
-            jumpi(loop, i)
-            ret := keccak256(0, 40)
-        }
-    }
-}
diff --git a/lib/modules/ens/embarkjs.js b/lib/modules/ens/embarkjs.js
index 52e8ca109..7e71ea8cc 100644
--- a/lib/modules/ens/embarkjs.js
+++ b/lib/modules/ens/embarkjs.js
@@ -198,11 +198,13 @@ __embarkENS.resolve = function (name) {
   }).catch(err => err);
 };
 
-__embarkENS.lookup = function (address) {
+__embarkENS.lookup = function (address, cb) {
   const self = this;
 
-  if (self.ens === undefined) return;
-
+  if (!self.ens) {
+    console.log("ENS provider not set. Exitting.");
+    return;
+  }
   if (address.startsWith("0x")) address = address.slice(2);
 
   let node = namehash.hash(address.toLowerCase() + ".addr.reverse");
@@ -212,9 +214,8 @@ __embarkENS.lookup = function (address) {
     return resolverContract.methods.name(node).call();
   }).then((name) => {
     if (name === "" || name === undefined) {
-      console.warn("ENS name not found");
-      return;
+      cb(new Error("Name not found"), null);      
     }
-    return name;
-  }).catch(err => err);
+    cb(null, name);
+  }).catch(err => cb(err));
 };