diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary
index d40748e..be2ee31 100644
--- a/META-INF/com/google/android/update-binary
+++ b/META-INF/com/google/android/update-binary
@@ -24,7 +24,9 @@ set -x
 
 exxit() {
   local e=$?
-  rm -rf /dev/.${id}-install || :
+  set +eu
+  rm -rf /dev/.${id}-install /data/adb/modules_update/$id
+  (abort) > /dev/null
   echo
   exit $e
 } 2>/dev/null
diff --git a/README.md b/README.md
index 586af36..e57d4d4 100644
--- a/README.md
+++ b/README.md
@@ -1152,6 +1152,9 @@ A common workaround is having `resume_capacity = pause_capacity - 1`. e.g., resu
 ---
 ## LATEST CHANGES
 
+**v2020.6.16 (202006160)**
+- Magisk related fixes
+
 **v2020.6.15.2 (202006152)**
 - Fixed Magisk related issues
 - General fixes & optimizations
@@ -1188,12 +1191,3 @@ A common workaround is having `resume_capacity = pause_capacity - 1`. e.g., resu
 - Workaround for "can't exit terminal after starting/restarting accd"
 - Works in recovery mode (system must be mounted first)
 > Release note: refer to the readme for a full list of changes and features
-
-**v2020.5.4-rc (202005040)**
-- `--set` can now set (var=value) and restore (var=) current and voltage limits as well, e.g., `acc -s mcc=1800 mcv= pc=75 rc=70`
-- `--set [[a-z]|--opt]` commands can alternatively be written as `-s[a-z]`, e.g., `acc -sv 3920 --exit`
-- Current & voltage limit and battery idle mode test now work in AccA 1.0.23 (27)
-- Enhanced "charge once to a given capacity without restrictions" feature
-- Major fixes & optimizations
-- Send SIGKILL 5 seconds after SIGTERM to forcibly terminate stubborn acc processes
-- Write to each ctrl file 3 times (with 200 milliseconds delays in-between) instead of just once; this is an attempt to force changes that don't take effect immediately or at all
diff --git a/customize.sh b/customize.sh
index d40748e..be2ee31 100644
--- a/customize.sh
+++ b/customize.sh
@@ -24,7 +24,9 @@ set -x
 
 exxit() {
   local e=$?
-  rm -rf /dev/.${id}-install || :
+  set +eu
+  rm -rf /dev/.${id}-install /data/adb/modules_update/$id
+  (abort) > /dev/null
   echo
   exit $e
 } 2>/dev/null
diff --git a/install.sh b/install.sh
index d40748e..be2ee31 100644
--- a/install.sh
+++ b/install.sh
@@ -24,7 +24,9 @@ set -x
 
 exxit() {
   local e=$?
-  rm -rf /dev/.${id}-install || :
+  set +eu
+  rm -rf /dev/.${id}-install /data/adb/modules_update/$id
+  (abort) > /dev/null
   echo
   exit $e
 } 2>/dev/null
diff --git a/module.prop b/module.prop
index fc73527..2b72310 100644
--- a/module.prop
+++ b/module.prop
@@ -1,6 +1,6 @@
 id=acc
 name=Advanced Charging Controller (ACC)
-version=v2020.6.15.2
-versionCode=202006152
+version=v2020.6.16
+versionCode=202006160
 author=VR25 (patreon.com/vr25)
 description=ACC is an Android software. It's primarily intended for extending battery service life. In a nutshell, this is achieved through limiting charging current, temperature and voltage. Any root solution is supported. A recent stable Magisk version is recommended. If you're reading this from Magisk Manager > Downloads, tap here to open the documentation. Once there, if you're lazy, jump to the quick start section.