diff --git a/app/build.gradle b/app/build.gradle
index 33a3ba1..d47feff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"
 
     defaultConfig {
         applicationId "com.mindorks.test"
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -28,9 +28,9 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support:design:24.2.1'
-    compile 'com.android.support:cardview-v7:24.2.1'
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:design:25.1.0'
+    compile 'com.android.support:cardview-v7:25.1.0'
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.google.code.gson:gson:2.7'
 
diff --git a/build.gradle b/build.gradle
index cca0438..cc54e1a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/placeholderview/build.gradle b/placeholderview/build.gradle
index dfc093e..889305c 100644
--- a/placeholderview/build.gradle
+++ b/placeholderview/build.gradle
@@ -25,12 +25,12 @@ ext {
 }
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 7
         versionName "0.5.2"
     }
@@ -44,7 +44,7 @@ android {
 
 dependencies {
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:recyclerview-v7:24.+'
+    compile 'com.android.support:recyclerview-v7:25.+'
 }
 
 apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
diff --git a/placeholderview/src/main/java/com/mindorks/placeholderview/SwipePlaceHolderView.java b/placeholderview/src/main/java/com/mindorks/placeholderview/SwipePlaceHolderView.java
index 45ab14b..e5a42f2 100644
--- a/placeholderview/src/main/java/com/mindorks/placeholderview/SwipePlaceHolderView.java
+++ b/placeholderview/src/main/java/com/mindorks/placeholderview/SwipePlaceHolderView.java
@@ -13,6 +13,7 @@
 import android.widget.FrameLayout;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -682,6 +683,15 @@ public void removeViews(int start, int count) {
      */
     @Override
     public void removeAllViews() {
+        Iterator<SwipeViewBinder<Object, FrameView>> iterator = mSwipeViewBinderList.iterator();
+        while (iterator.hasNext()){
+            SwipeViewBinder<Object, FrameView> swipeViewBinder = iterator.next();
+            if(swipeViewBinder != null){
+                swipeViewBinder.unbind();
+            }
+            iterator.remove();
+        }
+        mRestoreResolverOnUndo = null;
         super.removeAllViews();
     }