diff --git a/README.md b/README.md
index 12471e0..44ecaa5 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ```clojure
 [com.taoensso/nippy "1.2.1"]       ; Stable
-[com.taoensso/nippy "2.0.0-beta1"] ; Development (notes below)
+[com.taoensso/nippy "2.0.0-beta2"] ; Development (notes below)
 ```
 
 v2 adds pluggable compression, crypto support (also pluggable), an improved API (including much better error messages), easier integration into other tools/libraries, and hugely improved performance.
diff --git a/project.clj b/project.clj
index 64dca4d..29b02d7 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject com.taoensso/nippy "2.0.0-beta1"
+(defproject com.taoensso/nippy "2.0.0-beta2"
   :description "Clojure serialization library"
   :url "https://github.com/ptaoussanis/nippy"
   :license {:name "Eclipse Public License"
@@ -6,7 +6,8 @@
   :dependencies [[org.clojure/clojure    "1.4.0"]
                  [expectations           "1.4.43"]
                  [org.iq80.snappy/snappy "0.3"]
-                 [cc.qbits/grease        "0.2.1"]]
+                 ;; [cc.qbits/grease        "0.2.1"]
+                 ]
   :profiles {:1.4   {:dependencies [[org.clojure/clojure "1.4.0"]]}
              :1.5   {:dependencies [[org.clojure/clojure "1.5.1"]]}
              :dev   {:dependencies []}
diff --git a/src/taoensso/nippy.clj b/src/taoensso/nippy.clj
index de014f7..499d3d9 100644
--- a/src/taoensso/nippy.clj
+++ b/src/taoensso/nippy.clj
@@ -6,8 +6,11 @@
              (utils       :as utils)
              (compression :as compression :refer (snappy-compressor))
              (encryption  :as encryption  :refer (aes128-encryptor))])
-  (:import  [java.io DataInputStream DataOutputStream]
-            [cc.qbits.grease.io FastByteArrayInputStream FastByteArrayOutputStream]
+  (:import  [java.io DataInputStream DataOutputStream ByteArrayOutputStream
+             ByteArrayInputStream]
+            ;; [java.io DataInputStream DataOutputStream]
+            ;;[cc.qbits.grease.io FastByteArrayInputStream
+            ;;FastByteArrayOutputStream]
             [clojure.lang Keyword BigInt Ratio PersistentQueue PersistentTreeMap
              PersistentTreeSet IPersistentList IPersistentVector IPersistentMap
              IPersistentSet IPersistentCollection]))
@@ -171,7 +174,7 @@
                        compressor snappy-compressor
                        encryptor  aes128-encryptor}}]]
   (when legacy-mode (assert-legacy-args compressor password))
-  (let [ba     (FastByteArrayOutputStream.)
+  (let [ba     (ByteArrayOutputStream.)
         stream (DataOutputStream. ba)]
     (binding [*print-dup* print-dup?] (freeze-to-stream x stream))
     (let [ba (.toByteArray ba)
@@ -283,7 +286,7 @@
               (let [ba data-ba
                     ba (if password (encryption/decrypt encryptor password ba) ba)
                     ba (if compressor (compression/decompress compressor ba) ba)
-                    stream (DataInputStream. (FastByteArrayInputStream. ba))]
+                    stream (DataInputStream. (ByteArrayInputStream. ba))]
                 (binding [*read-eval* read-eval?] (thaw-from-stream stream)))
               (catch Exception e
                 (cond