diff --git a/crypto/build.gradle b/crypto/build.gradle
index 3d72939a1..66361fb53 100644
--- a/crypto/build.gradle
+++ b/crypto/build.gradle
@@ -1,12 +1,12 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-kapt'
 }
 
 android {
     compileSdkVersion 32
     buildToolsVersion "32.0.0"
+    ndkVersion "21.4.7075529"
 
     defaultConfig {
         minSdkVersion 15
@@ -42,5 +42,5 @@ dependencies {
     // Crypto
     implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
 
-    androidTestImplementation "androidx.test:runner:$android_test_version"
+    testImplementation "androidx.test:runner:$android_test_version"
 }
diff --git a/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt b/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
deleted file mode 100644
index 37b0a4e7c..000000000
--- a/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2021 Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePassDX.
- *
- * KeePassDX is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * KeePassDX is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.encrypt
-
-class CipherTest {
-
-    // TODO Cipher Tests
-
-}
diff --git a/database/build.gradle b/database/build.gradle
index f0cdf19d2..4c12bb819 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -1,12 +1,9 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
-apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 32
     buildToolsVersion "32.0.0"
-    ndkVersion "21.4.7075529"
 
     defaultConfig {
         minSdkVersion 15