diff --git a/.cppQuickFix b/.cppQuickFix
deleted file mode 100644
index 2fd9a0cbe..000000000
--- a/.cppQuickFix
+++ /dev/null
@@ -1,3 +0,0 @@
-[CppEditor.QuickFix]
-GettersOutsideClassFrom=-1
-SettersOutsideClassFrom=-1
diff --git a/client/android/AndroidManifest.xml b/client/android/AndroidManifest.xml
index 78d575dad..a18d20343 100644
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -93,7 +93,7 @@
             <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
             <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
         </service>
-        <service android:name="org.amnezia.vpn.qt.VPNPermissionHelper">
+        <service android:name="org.amnezia.vpn.qt.VPNPermissionHelper" android:permission="android.permission.BIND_VPN_SERVICE">
             <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
         </service>
         <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
diff --git a/client/android/build.gradle b/client/android/build.gradle
index 001dc4cbd..5d662814f 100644
--- a/client/android/build.gradle
+++ b/client/android/build.gradle
@@ -43,7 +43,6 @@ apply plugin: 'kotlin-kapt'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation 'androidx.core:core-ktx:1.1.0'
-    //implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0-alpha02"
     implementation "androidx.security:security-crypto:1.1.0-alpha03"
     implementation "androidx.security:security-identity-credential:1.0.0-alpha02"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2"
@@ -144,6 +143,18 @@ android {
            }
        }
    }
+
+//   externalNativeBuild {
+//       cmake {
+//           path 'wireguard/CMakeLists.txt'
+//       }
+//   }
+
+//   externalNativeBuild {
+//       cmake {
+//           path 'openvpn/src/main/cpp/CMakeLists.txt'
+//       }
+//   }
 }
 
 
diff --git a/client/android/gradle.properties b/client/android/gradle.properties
index 8ecc37207..fd9155bcf 100644
--- a/client/android/gradle.properties
+++ b/client/android/gradle.properties
@@ -3,7 +3,6 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-#org.gradle.jvmargs=-Xmx2048m
 org.gradle.jvmargs=-Xmx1536m
 
 # Gradle caching allows reusing the build artifacts from a previous
diff --git a/client/android/src/org/amnezia/vpn/qt/VPNActivity.java b/client/android/src/org/amnezia/vpn/qt/VPNActivity.java
index a9ef6332b..11d990630 100644
--- a/client/android/src/org/amnezia/vpn/qt/VPNActivity.java
+++ b/client/android/src/org/amnezia/vpn/qt/VPNActivity.java
@@ -17,6 +17,8 @@ public class VPNActivity extends org.qtproject.qt5.android.bindings.QtActivity {
     return super.onKeyDown(keyCode, event);
   }
 
+// TODO finalize
+// https://github.com/mozilla-mobile/mozilla-vpn-client/blob/6acff5dd9f072380a04c3fa12e9f3c98dbdd7a26/src/platforms/android/androidvpnactivity.h
   @Override
   public void onBackPressed() {
 //      super.onBackPressed();
diff --git a/client/client.pro b/client/client.pro
index 3ccac0351..909795848 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -270,10 +270,6 @@ android {
       ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopvpnutil.so
       ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpn3.so
       ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpnexec.so
-
-#      ANDROID_EXTRA_LIBS += $$PWD/android/lib/shadowsocks/$${abi}/libss-local.so
-#      ANDROID_EXTRA_LIBS += $$PWD/android/lib/shadowsocks/$${abi}/libtun2socks.so
-#      ANDROID_EXTRA_LIBS += $$PWD/android/lib/shadowsocks/$${abi}/libredsocks.so
    }
 }
 
@@ -371,7 +367,5 @@ ios {
 # %{sourceDir}/client/ios/xcode_patcher.rb %{buildDir}/client/AmneziaVPN.xcodeproj 2.0 2.0.0 ios 1
 }
 
-DISTFILES +=
-