diff --git a/src/components/aside/aside.js b/src/components/aside/aside.js
index bd85d537ee..92b4af05b9 100644
--- a/src/components/aside/aside.js
+++ b/src/components/aside/aside.js
@@ -77,7 +77,7 @@ new IonicComponent(Aside, {
       [instance => instance.side == 'top', gestures.TopAsideGesture],
       [instance => instance.side == 'bottom', gestures.BottomAsideGesture],
       [instance => instance.side == 'right', gestures.RightAsideGesture],
-      [instance => instance.side == 'left', gestures.LeftAsideGesture]
+      [instance => instance.side == 'left', gestures.LeftAsideGesture],
     ],
     type: [
       [instance => instance.type == 'overlay', types.AsideTypeOverlay],
@@ -86,4 +86,3 @@ new IonicComponent(Aside, {
     ]
   }
 })
-
diff --git a/src/components/item/item-complex/item-complex.scss b/src/components/item/item-complex/item-complex.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/item/item-complex/item-reorder.js b/src/components/item/item-complex/item-reorder.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/item/item-complex/item-reveal-button.js b/src/components/item/item-complex/item-reveal-button.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/item/item-complex/item-swipe-button.js b/src/components/item/item-complex/item-swipe-button.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/item/item-complex/item-swipe-gesture.js b/src/components/item/item-complex/item-swipe-gesture.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/item/item.js b/src/components/item/item.js
index 6e9037241a..7c8e662da7 100644
--- a/src/components/item/item.js
+++ b/src/components/item/item.js
@@ -1,4 +1,5 @@
 import {NgElement, Component, Template} from 'angular2/angular2'
+import {IonicComponent} from 'ionic2/config/component'
 
 @Component({
   selector: 'ion-item'
@@ -16,6 +17,8 @@ import {NgElement, Component, Template} from 'angular2/angular2'
 })
 export class Item {
   constructor(@NgElement() ele:NgElement) {
-    ele.domElement.classList.add('item')
+    Item.config.invoke(this)
   }
 }
+
+new IonicComponent(Item, {})
diff --git a/src/gestures/drag-gesture.js b/src/gestures/drag-gesture.js
index bb82ba87a7..9f974926c1 100644
--- a/src/gestures/drag-gesture.js
+++ b/src/gestures/drag-gesture.js
@@ -13,18 +13,18 @@ export class DragGesture extends Gesture {
   }
   listen() {
     super.listen();
-    this.hammertime.on('panstart', ev => {
+    this.on('panstart', ev => {
       if (this.onDragStart(ev) !== false) {
         this.dragging = true;
       }
     });
-    this.hammertime.on('panmove', ev => {
+    this.on('panmove', ev => {
       if (!this.dragging) return;
       if (this.onDrag(ev) === false) {
         this.dragging = false;
       }
     });
-    this.hammertime.on('panend', ev => {
+    this.on('panend', ev => {
       if (!this.dragging) return;
       this.onDragEnd(ev);
       this.dragging = false;
diff --git a/src/gestures/gesture.js b/src/gestures/gesture.js
index faef58a508..3d212d0c34 100644
--- a/src/gestures/gesture.js
+++ b/src/gestures/gesture.js
@@ -18,6 +18,10 @@ export class Gesture {
     util.extend(this._options, opts);
   }
 
+  on(...args) {
+    return this.hammertime.on.apply(this.hammertime, args)
+  }
+
   listen() {
     this.hammertime = Hammer(this.element, this._options);
   }
@@ -26,7 +30,7 @@ export class Gesture {
     this.hammertime = null;
   }
   destroy() {
-    this.hammertime.destroy();
-    this.hammertime = null;
+    this.unlisten()
   }
 }
+