diff --git a/bin/create b/bin/create
index 2b3fe059..a6b5c8c6 100755
--- a/bin/create
+++ b/bin/create
@@ -47,8 +47,8 @@ fi
 # cleanup after exit and/or on error
 function on_exit {
     echo "Cleaning up ..."
-    [ -f $BUILD_PATH/framework/libs/commons-codec-1.6.jar ] && rm $BUILD_PATH/framework/libs/commons-codec-1.6.jar
-    [ -d $BUILD_PATH/framework/libs ] && rmdir $BUILD_PATH/framework/libs
+    # [ -f $BUILD_PATH/framework/libs/commons-codec-1.6.jar ] && rm $BUILD_PATH/framework/libs/commons-codec-1.6.jar
+    # [ -d $BUILD_PATH/framework/libs ] && rmdir $BUILD_PATH/framework/libs
     [ -f $BUILD_PATH/framework/assets/www/cordova-$VERSION.js ] && rm $BUILD_PATH/framework/assets/www/cordova-$VERSION.js
     [ -f $BUILD_PATH/framework/cordova-$VERSION.jar ] && rm $BUILD_PATH/framework/cordova-$VERSION.jar
 }
diff --git a/bin/create.js b/bin/create.js
index 18220553..46fd0064 100644
--- a/bin/create.js
+++ b/bin/create.js
@@ -52,10 +52,10 @@ function exec(s, output) {
 
 function cleanup() {
     // Cleanup
-    if(fso.FileExists(ROOT + '\\framework\\libs\\commons-codec-1.6.jar')) {
-        fso.DeleteFile(ROOT + '\\framework\\libs\\commons-codec-1.6.jar');
-        fso.DeleteFolder(ROOT + '\\framework\\libs', true);
-    }
+//    if(fso.FileExists(ROOT + '\\framework\\libs\\commons-codec-1.6.jar')) {
+//        fso.DeleteFile(ROOT + '\\framework\\libs\\commons-codec-1.6.jar');
+//        fso.DeleteFolder(ROOT + '\\framework\\libs', true);
+//    }
     if(fso.FileExists(ROOT + '\\framework\\cordova-'+VERSION+'.jar')) {
         fso.DeleteFile(ROOT + '\\framework\\cordova-'+VERSION+'.jar');
     }
diff --git a/bin/tests/test_create_unix.js b/bin/tests/test_create_unix.js
index 3462f293..75e0697e 100644
--- a/bin/tests/test_create_unix.js
+++ b/bin/tests/test_create_unix.js
@@ -20,6 +20,15 @@ var create_project = spawn(build_path + '/bin/create',
                             package_name,
                             project_name]);
 
+process.on('uncaughtException', function (err) {
+    console.log('Caught exception: ' + err);
+    spawn('rm', ['-rf', project_path], function(code) {
+        if(code != 0) {
+            console.log("Could not delete project directory");
+        }
+    });
+});
+
 create_project.on('exit', function(code) {
 
     assert.equal(code, 0, 'Project did not get created');
@@ -30,9 +39,9 @@ create_project.on('exit', function(code) {
     });
 
     // make sure the build directory was cleaned up
-    path.exists(build_path + '/framework/libs', function(exists) {
-        assert(!exists, 'libs directory did not get cleaned up');
-    });
+//    path.exists(build_path + '/framework/libs', function(exists) {
+//        assert(!exists, 'libs directory did not get cleaned up');
+//    });
     path.exists(build_path + util.format('/framework/assets/cordova-%s.js', version), function(exists) {
         assert(!exists, 'javascript file did not get cleaned up');
     });