diff --git a/build.gradle b/build.gradle
index b69bbfa..9b921b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 group 'nl.astraeus'
-version '0.1.3-SNAPSHOT'
+version '0.1.4-SNAPSHOT'
 
 apply plugin: 'kotlin2js'
 apply plugin: 'kotlin-dce-js'

diff --git a/build.gradle b/build.gradle
index b69bbfa..9b921b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 group 'nl.astraeus'
-version '0.1.3-SNAPSHOT'
+version '0.1.4-SNAPSHOT'
 
 apply plugin: 'kotlin2js'
 apply plugin: 'kotlin-dce-js'
diff --git a/komp.ipr b/komp.ipr
index 492667b..4f12ad8 100644
--- a/komp.ipr
+++ b/komp.ipr
@@ -3,7 +3,7 @@
   <component name="CheckStyle-IDEA">
     <option name="configuration">
       <map>
-        <entry key="checkstyle-version" value="8.4" />
+        <entry key="checkstyle-version" value="8.5" />
         <entry key="copy-libs" value="false" />
         <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
         <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />

diff --git a/build.gradle b/build.gradle
index b69bbfa..9b921b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 group 'nl.astraeus'
-version '0.1.3-SNAPSHOT'
+version '0.1.4-SNAPSHOT'
 
 apply plugin: 'kotlin2js'
 apply plugin: 'kotlin-dce-js'
diff --git a/komp.ipr b/komp.ipr
index 492667b..4f12ad8 100644
--- a/komp.ipr
+++ b/komp.ipr
@@ -3,7 +3,7 @@
   <component name="CheckStyle-IDEA">
     <option name="configuration">
       <map>
-        <entry key="checkstyle-version" value="8.4" />
+        <entry key="checkstyle-version" value="8.5" />
         <entry key="copy-libs" value="false" />
         <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
         <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
diff --git a/src/main/kotlin/nl/astraeus/komp/KompElement.kt b/src/main/kotlin/nl/astraeus/komp/KompElement.kt
index 98fe23d..92471ec 100644
--- a/src/main/kotlin/nl/astraeus/komp/KompElement.kt
+++ b/src/main/kotlin/nl/astraeus/komp/KompElement.kt
@@ -132,9 +132,6 @@
       if (komp == null) {
         throw IllegalStateException("komponent == null in type Komponent!")
       } else {
-        komp.element?.also {
-          Komponent.remove(it)
-        }
 
         val kompElement = komp.create()
         val element = kompElement.create()
@@ -142,8 +139,6 @@
         komp.kompElement = kompElement
         komp.element = element
 
-        Komponent.define(element, komp)
-
         element
       }
     }

diff --git a/build.gradle b/build.gradle
index b69bbfa..9b921b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 group 'nl.astraeus'
-version '0.1.3-SNAPSHOT'
+version '0.1.4-SNAPSHOT'
 
 apply plugin: 'kotlin2js'
 apply plugin: 'kotlin-dce-js'
diff --git a/komp.ipr b/komp.ipr
index 492667b..4f12ad8 100644
--- a/komp.ipr
+++ b/komp.ipr
@@ -3,7 +3,7 @@
   <component name="CheckStyle-IDEA">
     <option name="configuration">
       <map>
-        <entry key="checkstyle-version" value="8.4" />
+        <entry key="checkstyle-version" value="8.5" />
         <entry key="copy-libs" value="false" />
         <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
         <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
diff --git a/src/main/kotlin/nl/astraeus/komp/KompElement.kt b/src/main/kotlin/nl/astraeus/komp/KompElement.kt
index 98fe23d..92471ec 100644
--- a/src/main/kotlin/nl/astraeus/komp/KompElement.kt
+++ b/src/main/kotlin/nl/astraeus/komp/KompElement.kt
@@ -132,9 +132,6 @@
       if (komp == null) {
         throw IllegalStateException("komponent == null in type Komponent!")
       } else {
-        komp.element?.also {
-          Komponent.remove(it)
-        }
 
         val kompElement = komp.create()
         val element = kompElement.create()
@@ -142,8 +139,6 @@
         komp.kompElement = kompElement
         komp.element = element
 
-        Komponent.define(element, komp)
-
         element
       }
     }
diff --git a/src/main/kotlin/nl/astraeus/komp/Komponent.kt b/src/main/kotlin/nl/astraeus/komp/Komponent.kt
index 99dbe50..bf3a1d2 100644
--- a/src/main/kotlin/nl/astraeus/komp/Komponent.kt
+++ b/src/main/kotlin/nl/astraeus/komp/Komponent.kt
@@ -3,9 +3,6 @@
 import kotlinx.html.HtmlBlockTag
 import org.w3c.dom.HTMLElement
 import org.w3c.dom.Node
-import kotlin.collections.component1
-import kotlin.collections.component2
-import kotlin.collections.set
 
 fun HtmlBlockTag.include(component: Komponent) {
   val consumer = this.consumer
@@ -27,8 +24,6 @@
   open fun create(): KompElement {
     val result = render(KompConsumer())
 
-    //result.komponent = this
-
     return result
   }
 
@@ -36,14 +31,14 @@
 
   open fun refresh() {
     if (!rendered) {
-      refresh(element)
+      refresh(this)
     } else {
       update()
     }
   }
 
   open fun update() {
-    refresh(element)
+    refresh(this)
   }
 
   override fun equals(other: Any?): Boolean {
@@ -66,8 +61,6 @@
 
   companion object {
 
-    private val elements: MutableMap<Node, Komponent> = HashMap()
-
     var logRenderEvent = false
     var logReplaceEvent = false
     var logEquals = false
@@ -84,13 +77,9 @@
 
       parent.replaceChild(newElement, oldElement)
 
-      elements.remove(oldElement)
-
       newKomponent.komponent?.also {
         it.kompElement = newKomponent
         it.element = newElement
-
-        elements[newElement] = it
       }
 
       return newElement
@@ -104,23 +93,18 @@
       }
 
       parent.removeChild(element)
-
-      elements.remove(element)
     }
 
     fun appendElement(element: Node, kompElement: KompElement) {
       val newElement = kompElement.create()
-      if (Komponent.logReplaceEvent) {
+      if (logReplaceEvent) {
         console.log("Append", newElement)
       }
       element.appendChild(newElement)
     }
 
-    fun define(element: Node, component: Komponent) {
-      elements[element] = component
-    }
-
     fun create(parent: HTMLElement, component: Komponent, insertAsFirst: Boolean = false) {
+
       component.kompElement = component.create()
       val element = component.kompElement?.create()
 
@@ -132,61 +116,33 @@
         }
 
         component.element = element
-        elements[element] = component
       }
     }
 
-    fun remove(element: Node) {
-      elements.remove(element)
-    }
+    fun refresh(komponent: Komponent) {
+      komponent.element?.let { element ->
 
-    @JsName("remove")
-    fun remove(component: Komponent) {
-      for ((key, value) in elements) {
-        if (value == component) {
-          elements.remove(key)
+        if (logRenderEvent) {
+          console.log("Rendering", komponent)
         }
-      }
-    }
 
-    fun refresh(component: Komponent) {
-      refresh(component.element)
-    }
+        //val parent = element.parentElement
+        val newElement = komponent.create()
+        val kompElement = komponent.kompElement
 
-    fun refresh(element: Node?) {
-      if (element != null) {
-        elements[element]?.let {
-          if (logRenderEvent) {
-            console.log("Rendering", it)
-          }
+        val replacedElement = if (updateStrategy == UpdateStrategy.REPLACE) {
+          //val replacedElement = replaceNode(newElement, element)
 
-          //val parent = element.parentElement
-          val newElement = it.create()
-
-          if (updateStrategy == UpdateStrategy.REPLACE) {
-            //val replacedElement = replaceNode(newElement, element)
-
-            val replacedElement = replaceNode(newElement, element)
-            it.element = replacedElement
-            elements[replacedElement] = it
-          } else {
-            val kompElement = it.kompElement
-
-            val replacedElement = if (kompElement != null) {
-              DomDiffer.replaceDiff(kompElement, newElement, element)
-            } else {
-              newElement.create()
-            }
-
-            it.kompElement = newElement
-            it.element = replacedElement
-
-            elements[replacedElement] = it
-          }
-
-          elements.remove(element)
-          it.rendered = true
+          replaceNode(newElement, element)
+        } else if (kompElement != null) {
+          DomDiffer.replaceDiff(kompElement, newElement, element)
+        } else {
+          newElement.create()
         }
+
+        komponent.kompElement = newElement
+        komponent.element = replacedElement
+        komponent.rendered = true
       }
     }
   }