diff --git a/env/dev/run.clj b/env/dev/run.clj
index c9839bbab2..e1b46f903d 100644
--- a/env/dev/run.clj
+++ b/env/dev/run.clj
@@ -1,4 +1,4 @@
-(ns ^:figwheel-no-load dev-run
+(ns ^:figwheel-no-load run
   (:use [figwheel-api]))
 
 (start)
diff --git a/project.clj b/project.clj
index 460d024cd5..a30395c5b9 100644
--- a/project.clj
+++ b/project.clj
@@ -2,17 +2,16 @@
   :url "https://github.com/status-im/status-react/"
   :license {:name "Eclipse Public License"
             :url  "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure "1.9.0-RC1"]
+  :dependencies [[org.clojure/clojure "1.9.0"]
                  [org.clojure/clojurescript "1.9.946"]
-                 [org.clojure/core.async "0.3.443"]
+                 [org.clojure/core.async "0.4.474"]
                  [reagent "0.7.0" :exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server cljsjs/create-react-class]]
                  [re-frame "0.10.2"]
-                 [com.andrewmcveigh/cljs-time "0.5.0"]
+                 [com.andrewmcveigh/cljs-time "0.5.2"]
                  [com.taoensso/timbre "4.10.0"]
                  [hickory "0.7.1"]
                  [com.cognitect/transit-cljs "0.8.243"]]
   :plugins [[lein-cljsbuild "1.1.7"]
-            [lein-figwheel "0.5.14"]
             [lein-re-frisk "0.5.5"]]
   :clean-targets ["target/" "index.ios.js" "index.android.js"]
   :aliases {"prod-build"       ^{:doc "Recompile code with prod profile."}
diff --git a/scripts/build-android.sh b/scripts/build-android.sh
index 48135c7c33..06a8cd51fd 100755
--- a/scripts/build-android.sh
+++ b/scripts/build-android.sh
@@ -14,23 +14,23 @@ echo
 
 GRADLE_PROPERTIES="--daemon --parallel -q -b android/build.gradle"
 
+npm install
+
 case $TARGET in
   debug)
-    echo "Not supported yet."
-    ## lein do clean, cljsbuild once android && ./android/gradlew ${GRADLE_PROPERTIES} assembleDebug
-    ## echo "Generated android/app/build/outputs/apk/app-debug.apk"
-    ## TODO Blocked by https://github.com/status-im/status-react/issues/2669
+    lein do clean, cljsbuild once android && ./android/gradlew ${GRADLE_PROPERTIES} assembleDebug
+    echo "Generated android/app/build/outputs/apk/debug/app-debug.apk"
     exit 1
     ;;
-  prod)
+  release)
     STORE_FILE=$(property_gradle 'STATUS_RELEASE_STORE_FILE')
     [[ ! -e "${STORE_FILE/#\~/$HOME}" ]] && echo "Please generate keystore first using ./generate-keystore.sh" && exit 0
     lein do clean, with-profile prod cljsbuild once android && ./android/gradlew ${GRADLE_PROPERTIES} assembleRelease
-    cecho "Generated @b@blueandroid/app/build/outputs/apk/app-release.apk"
+    cecho "Generated @b@blueandroid/app/build/outputs/apk/release/app-release.apk"
     echo
     exit
     ;;
   *)
-    echo "Only debug and prod targets are supported"
+    echo "Only debug and release targets are supported"
     exit 1
 esac
diff --git a/src/status_im/chat/events.cljs b/src/status_im/chat/events.cljs
index b94fa08456..7d5a142ea8 100644
--- a/src/status_im/chat/events.cljs
+++ b/src/status_im/chat/events.cljs
@@ -1,5 +1,4 @@
 (ns status-im.chat.events
-  (:require-macros [cljs.core.async.macros :as async])
   (:require [cljs.core.async :as async]
             [re-frame.core :as re-frame]
             [taoensso.timbre :as log]
diff --git a/src/status_im/chat/events/queue_message.cljs b/src/status_im/chat/events/queue_message.cljs
index eca1d67bb6..40337b8f2f 100644
--- a/src/status_im/chat/events/queue_message.cljs
+++ b/src/status_im/chat/events/queue_message.cljs
@@ -1,5 +1,4 @@
 (ns status-im.chat.events.queue-message
-  (:require-macros [cljs.core.async.macros :as async-macros])
   (:require [cljs.core.async :as async]
             [re-frame.core :as re-frame]
             [status-im.utils.config :as config]
diff --git a/src/status_im/native_module/impl/module.cljs b/src/status_im/native_module/impl/module.cljs
index 58fe3b5cd6..02bcc8cf03 100644
--- a/src/status_im/native_module/impl/module.cljs
+++ b/src/status_im/native_module/impl/module.cljs
@@ -1,6 +1,6 @@
 (ns status-im.native-module.impl.module
   (:require-macros
-   [cljs.core.async.macros :as async :refer [go-loop go]])
+   [cljs.core.async.macros :refer [go-loop go]])
   (:require [status-im.ui.components.react :as r]
             [re-frame.core :refer [dispatch]]
             [taoensso.timbre :as log]
diff --git a/src/status_im/protocol/web3/delivery.cljs b/src/status_im/protocol/web3/delivery.cljs
index 13a5ab1519..4b3d93481b 100644
--- a/src/status_im/protocol/web3/delivery.cljs
+++ b/src/status_im/protocol/web3/delivery.cljs
@@ -1,5 +1,4 @@
 (ns status-im.protocol.web3.delivery
-  (:require-macros [cljs.core.async.macros :as async])
   (:require [cljs.core.async :as async]
             [status-im.protocol.web3.transport :as t]
             [status-im.protocol.web3.utils :as u]
@@ -88,8 +87,8 @@
   [web3 message]
   {:pre [(valid? :protocol/message message)]} 
   (debug :add-pending-message! message)
-    ;; encryption can take some time, better to run asynchronously
-    (async/put! pending-message-queue [web3 message]))
+  ;; encryption can take some time, better to run asynchronously
+  (async/put! pending-message-queue [web3 message]))
 
 (s/def :delivery/pending-message
   (s/keys :req-un [:message/sig :message/to :shh/payload :payload/ack? ::id
diff --git a/src/status_im/utils/async.cljs b/src/status_im/utils/async.cljs
index c244dd5f07..fc3359b3ac 100644
--- a/src/status_im/utils/async.cljs
+++ b/src/status_im/utils/async.cljs
@@ -1,6 +1,5 @@
 (ns status-im.utils.async
   "Utility namespace containing `core.async` helper constructs"
-  (:require-macros [cljs.core.async.macros :as async])
   (:require [cljs.core.async :as async]))
 
 (defn chunked-pipe!
diff --git a/src/status_im/utils/pre_receiver.cljs b/src/status_im/utils/pre_receiver.cljs
index d3544175ed..a46b0d2ec8 100644
--- a/src/status_im/utils/pre_receiver.cljs
+++ b/src/status_im/utils/pre_receiver.cljs
@@ -1,5 +1,4 @@
 (ns status-im.utils.pre-receiver
-  (:require-macros [cljs.core.async.macros :as async])
   (:require [cljs.core.async :as async]
             [taoensso.timbre :as log]))
 
diff --git a/test/cljs/status_im/test/protocol/core.cljs b/test/cljs/status_im/test/protocol/core.cljs
index 4860d9479f..4822ad0f70 100644
--- a/test/cljs/status_im/test/protocol/core.cljs
+++ b/test/cljs/status_im/test/protocol/core.cljs
@@ -1,5 +1,4 @@
 (ns status-im.test.protocol.core
-  (:require-macros [cljs.core.async.macros :as async])
   (:require [cljs.test :refer-macros [deftest is testing run-tests
                                       async use-fixtures]]
             [cljs.nodejs :as nodejs]
diff --git a/test/cljs/status_im/test/utils/async.cljs b/test/cljs/status_im/test/utils/async.cljs
index 29eae43e58..1cf7e254b4 100644
--- a/test/cljs/status_im/test/utils/async.cljs
+++ b/test/cljs/status_im/test/utils/async.cljs
@@ -1,5 +1,4 @@
 (ns status-im.test.utils.async
-  (:require-macros [cljs.core.async.macros :as async])
   (:require [cljs.test :refer-macros [deftest is testing async]]
             [cljs.core.async :as async]
             [status-im.utils.async :as async-util]))
diff --git a/test/cljs/status_im/test/utils/pre_receiver.cljs b/test/cljs/status_im/test/utils/pre_receiver.cljs
index 043b7e592f..a49efcd502 100644
--- a/test/cljs/status_im/test/utils/pre_receiver.cljs
+++ b/test/cljs/status_im/test/utils/pre_receiver.cljs
@@ -1,5 +1,4 @@
 (ns status-im.test.utils.pre-receiver
-  (:require-macros [cljs.core.async.macros :as async])
   (:require [cljs.test :refer-macros [deftest is testing async]]
             [cljs.core.async :as async]
             [status-im.utils.pre-receiver :as pre-receiver]))