From 776022d583af3d03326557eec0cf35052ceb24ce Mon Sep 17 00:00:00 2001
From: Ricardo Guilherme Schmidt <3esmit@gmail.com>
Date: Tue, 20 Mar 2018 22:31:14 -0300
Subject: [PATCH] remove abstracted InstanceStorage to prevent errors

---
 contracts/deploy/DelayedUpdatableInstance.sol        |  2 +-
 contracts/deploy/DelayedUpdatableInstanceStorage.sol | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/contracts/deploy/DelayedUpdatableInstance.sol b/contracts/deploy/DelayedUpdatableInstance.sol
index af12bca..3ff6b0f 100644
--- a/contracts/deploy/DelayedUpdatableInstance.sol
+++ b/contracts/deploy/DelayedUpdatableInstance.sol
@@ -27,7 +27,7 @@ contract DelayedUpdatableInstance is DelayedUpdatableInstanceStorage, DelegatedC
     }
 
     /**
-     * @dev returns kernel if kernel that is configured
+     * @dev returns configured kernel
      * @return kernel address
      */
     function targetDelegatedCall()
diff --git a/contracts/deploy/DelayedUpdatableInstanceStorage.sol b/contracts/deploy/DelayedUpdatableInstanceStorage.sol
index 274da20..2d71661 100644
--- a/contracts/deploy/DelayedUpdatableInstanceStorage.sol
+++ b/contracts/deploy/DelayedUpdatableInstanceStorage.sol
@@ -1,17 +1,16 @@
 pragma solidity ^0.4.17;
 
-import "./InstanceStorage.sol";
-
 /**
- * @title InstanceStorage
+ * @title DelayedUpdatableInstanceStorage
  * @author Ricardo Guilherme Schmidt (Status Research & Development GmbH) 
- * @dev Defines kernel vars that Kernel contract share with Instance.
+ * @dev Defines kernel vars that Kernel contract share with DelayedUpdatableInstance.
  *      Important to avoid overwriting wrong storage pointers is that 
  *      InstanceStorage should be always the first contract at heritance.
  */
-contract DelayedUpdatableInstanceStorage is InstanceStorage {    
+contract DelayedUpdatableInstanceStorage {    
     // protected zone start (InstanceStorage vars)
-    Update update;
+    address public kernel;
+    Update public update;
     
     struct Update {
         address kernel;