diff --git a/annotation/.gitignore b/annotation/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/annotation/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/annotation/build.gradle b/annotation/build.gradle
deleted file mode 100644
index ee7f6d51..00000000
--- a/annotation/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-3-28. 
- */
-
-apply plugin: 'java-library'
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-kapt'
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
-
-sourceCompatibility = "7"
-targetCompatibility = "7"
-
-repositories {
-    mavenCentral()
-}
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
diff --git a/annotation/src/main/java/pl/szczodrzynski/edziennik/annotation/SelectiveDao.kt b/annotation/src/main/java/pl/szczodrzynski/edziennik/annotation/SelectiveDao.kt
deleted file mode 100644
index d37e5b0a..00000000
--- a/annotation/src/main/java/pl/szczodrzynski/edziennik/annotation/SelectiveDao.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-3-28.
- */
-
-package pl.szczodrzynski.edziennik.annotation
-
-import kotlin.reflect.KClass
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-@MustBeDocumented
-annotation class SelectiveDao(
-        val db: KClass<*>
-)
diff --git a/annotation/src/main/java/pl/szczodrzynski/edziennik/annotation/UpdateSelective.kt b/annotation/src/main/java/pl/szczodrzynski/edziennik/annotation/UpdateSelective.kt
deleted file mode 100644
index 224fca1c..00000000
--- a/annotation/src/main/java/pl/szczodrzynski/edziennik/annotation/UpdateSelective.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-3-28. 
- */
-
-package pl.szczodrzynski.edziennik.annotation
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.SOURCE)
-@MustBeDocumented
-annotation class UpdateSelective(
-        val primaryKeys: Array<String>,
-        val skippedColumns: Array<String> = []
-)
diff --git a/app/build.gradle b/app/build.gradle
index 4ad2fc5f..47d1b31b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -167,6 +167,8 @@ dependencies {
     implementation "eu.szkolny:nachos:0e5dfcaceb"
     //implementation project(":Navigation")
     implementation "eu.szkolny:szkolny-font:1dab7d64ed"
+    implementation "eu.szkolny.selective-dao:annotation:27f8f3f194"
+    kapt "eu.szkolny.selective-dao:codegen:27f8f3f194"
 
     implementation "com.github.ChuckerTeam.Chucker:library:3.0.1"
     //releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:3.0.1"
@@ -195,9 +197,6 @@ dependencies {
 
     implementation 'com.github.kuba2k2:NumberSlidingPicker:2921225f76'
 
-    implementation project(":annotation")
-    kapt project(":codegen")
-
     implementation 'com.google.android:flexbox:2.0.1'
 
     implementation 'com.qifan.powerpermission:powerpermission:1.3.0'
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AnnouncementDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AnnouncementDao.kt
index 67e034c5..88b3ccd1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AnnouncementDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AnnouncementDao.kt
@@ -8,9 +8,9 @@ import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.RawQuery
 import androidx.sqlite.db.SupportSQLiteQuery
+import eu.szkolny.selectivedao.annotation.SelectiveDao
+import eu.szkolny.selectivedao.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.annotation.SelectiveDao
-import pl.szczodrzynski.edziennik.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Announcement
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceDao.kt
index 97513689..3ffdc1b8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceDao.kt
@@ -8,9 +8,9 @@ import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.RawQuery
 import androidx.sqlite.db.SupportSQLiteQuery
+import eu.szkolny.selectivedao.annotation.SelectiveDao
+import eu.szkolny.selectivedao.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.annotation.SelectiveDao
-import pl.szczodrzynski.edziennik.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt
index a532602b..897d53ff 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt
@@ -10,9 +10,9 @@ import androidx.room.RawQuery
 import androidx.room.Transaction
 import androidx.sqlite.db.SimpleSQLiteQuery
 import androidx.sqlite.db.SupportSQLiteQuery
+import eu.szkolny.selectivedao.annotation.SelectiveDao
+import eu.szkolny.selectivedao.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.annotation.SelectiveDao
-import pl.szczodrzynski.edziennik.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeDao.kt
index 4fcfc721..6254f80b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeDao.kt
@@ -9,9 +9,9 @@ import androidx.room.Query
 import androidx.room.RawQuery
 import androidx.room.Transaction
 import androidx.sqlite.db.SupportSQLiteQuery
+import eu.szkolny.selectivedao.annotation.SelectiveDao
+import eu.szkolny.selectivedao.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.annotation.SelectiveDao
-import pl.szczodrzynski.edziennik.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Grade
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LuckyNumberDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LuckyNumberDao.kt
index ad44c0d3..3c752124 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LuckyNumberDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LuckyNumberDao.kt
@@ -8,9 +8,9 @@ import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.RawQuery
 import androidx.sqlite.db.SupportSQLiteQuery
+import eu.szkolny.selectivedao.annotation.SelectiveDao
+import eu.szkolny.selectivedao.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.annotation.SelectiveDao
-import pl.szczodrzynski.edziennik.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.kt
index a0be36ab..51d56854 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.kt
@@ -8,9 +8,9 @@ import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.RawQuery
 import androidx.sqlite.db.SupportSQLiteQuery
+import eu.szkolny.selectivedao.annotation.SelectiveDao
+import eu.szkolny.selectivedao.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.annotation.SelectiveDao
-import pl.szczodrzynski.edziennik.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Message
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeDao.kt
index 79bae175..51f3e839 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeDao.kt
@@ -8,9 +8,9 @@ import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.RawQuery
 import androidx.sqlite.db.SupportSQLiteQuery
+import eu.szkolny.selectivedao.annotation.SelectiveDao
+import eu.szkolny.selectivedao.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.annotation.SelectiveDao
-import pl.szczodrzynski.edziennik.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.Notice
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherAbsenceDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherAbsenceDao.kt
index 1528adf1..f12248b8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherAbsenceDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherAbsenceDao.kt
@@ -8,9 +8,9 @@ import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.RawQuery
 import androidx.sqlite.db.SupportSQLiteQuery
+import eu.szkolny.selectivedao.annotation.SelectiveDao
+import eu.szkolny.selectivedao.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.annotation.SelectiveDao
-import pl.szczodrzynski.edziennik.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.TeacherAbsence
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableDao.kt
index cc236dc6..c7cbee12 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableDao.kt
@@ -8,9 +8,9 @@ import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.RawQuery
 import androidx.sqlite.db.SupportSQLiteQuery
+import eu.szkolny.selectivedao.annotation.SelectiveDao
+import eu.szkolny.selectivedao.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.annotation.SelectiveDao
-import pl.szczodrzynski.edziennik.annotation.UpdateSelective
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Lesson
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
diff --git a/codegen/.gitignore b/codegen/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/codegen/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/codegen/build.gradle b/codegen/build.gradle
deleted file mode 100644
index e2630bd0..00000000
--- a/codegen/build.gradle
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-3-28. 
- */
-
-apply plugin: 'java-library'
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-kapt'
-
-kapt {
-    generateStubs = true
-}
-
-sourceSets {
-    main {
-        java {
-            srcDir "${buildDir.absolutePath}/tmp/kapt/main/kotlinGenerated/"
-        }
-    }
-}
-
-
-dependencies {
-    kapt project(":annotation")
-    compileOnly project(':annotation')
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-    // configuration generator for service providers
-    implementation "com.google.auto.service:auto-service:1.0-rc4"
-    kapt "com.google.auto.service:auto-service:1.0-rc4"
-    kapt "androidx.room:room-compiler:${versions.room}"
-    implementation "androidx.room:room-runtime:${versions.room}"
-    implementation "com.squareup:kotlinpoet:1.5.0"
-    implementation "androidx.sqlite:sqlite:2.1.0@aar"
-
-}
-
-sourceCompatibility = "7"
-targetCompatibility = "7"
diff --git a/codegen/src/main/java/pl/szczodrzynski/edziennik/codegen/FileGenerator.kt b/codegen/src/main/java/pl/szczodrzynski/edziennik/codegen/FileGenerator.kt
deleted file mode 100644
index 5b5b1f71..00000000
--- a/codegen/src/main/java/pl/szczodrzynski/edziennik/codegen/FileGenerator.kt
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-3-28.
- */
-
-package pl.szczodrzynski.edziennik.codegen
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Ignore
-import androidx.room.TypeConverters
-import com.google.auto.service.AutoService
-import com.squareup.kotlinpoet.*
-import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
-import pl.szczodrzynski.edziennik.annotation.SelectiveDao
-import pl.szczodrzynski.edziennik.annotation.UpdateSelective
-import java.io.File
-import javax.annotation.processing.*
-import javax.lang.model.SourceVersion
-import javax.lang.model.element.*
-import javax.lang.model.type.*
-import javax.lang.model.util.ElementFilter
-import javax.tools.Diagnostic
-import kotlin.reflect.KClass
-
-@Suppress("unused")
-@AutoService(Processor::class)
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
-@SupportedOptions(FileGenerator.KAPT_KOTLIN_GENERATED_OPTION_NAME)
-class FileGenerator : AbstractProcessor() {
-    companion object {
-        const val KAPT_KOTLIN_GENERATED_OPTION_NAME = "kapt.kotlin.generated"
-    }
-
-    private data class TypeConverter(val dataType: TypeMirror, val converterType: TypeElement, val methodName: Name, val returnType: TypeMirror)
-
-    private inline fun <reified T : Annotation> Element.getAnnotationClassValue(f: T.() -> KClass<*>) = try {
-        getAnnotation(T::class.java).f()
-        throw Exception("Expected to get a MirroredTypeException")
-    } catch (e: MirroredTypeException) {
-        e.typeMirror
-    }
-    private inline fun <reified T : Annotation> Element.getAnnotationClassValues(f: T.() -> Array<KClass<*>>) = try {
-        getAnnotation(T::class.java).f()
-        throw Exception("Expected to get a MirroredTypesException")
-    } catch (e: MirroredTypesException) {
-        e.typeMirrors
-    }
-
-    override fun process(set: MutableSet<out TypeElement>?, roundEnvironment: RoundEnvironment?): Boolean {
-        roundEnvironment?.getElementsAnnotatedWith(SelectiveDao::class.java)?.forEach { it ->
-            if (it.kind != ElementKind.CLASS) {
-                processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "Can only be applied to classes, element: $it")
-                return false
-            }
-
-            val generatedSourcesRoot = processingEnv.options[KAPT_KOTLIN_GENERATED_OPTION_NAME]
-            if (generatedSourcesRoot?.isEmpty() != false) {
-                processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "Can't find the target directory for generated Kotlin files.")
-                return false
-            }
-
-            val file = File(generatedSourcesRoot)
-            file.mkdirs()
-
-            val dao = it as TypeElement
-            processClass(dao, file)
-
-            //processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "package = $packageName, className = $className, methodName = $methodName, tableName = $tableName, paramName = $paramName, paramClass = $paramClass")
-        }
-        return true
-    }
-
-    private fun processClass(dao: TypeElement, file: File) {
-        val daoName = dao.simpleName.toString()
-        val packageName = processingEnv.elementUtils.getPackageOf(dao).toString()
-
-        val dbType = processingEnv.typeUtils.asElement(dao.getAnnotationClassValue<SelectiveDao> { db }) as TypeElement
-        val typeConverters = dbType.getAnnotationClassValues<TypeConverters> { value }.map {
-            processingEnv.typeUtils.asElement(it) as TypeElement
-        }.map { type ->
-            processingEnv.elementUtils.getAllMembers(type).mapNotNull { element ->
-                if (element is ExecutableElement) {
-                    if (element.returnType.toString() == "java.lang.String"
-                            || element.returnType.toString() == "java.lang.Long"
-                            || element.returnType.toString() == "java.lang.Integer"
-                            || element.returnType.kind.isPrimitive) {
-                        if (element.simpleName.startsWith("to") && element.parameters.isNotEmpty())
-                            return@mapNotNull TypeConverter(element.parameters.first().asType(), type, element.simpleName, element.returnType)
-                    }
-                }
-                null
-            }
-        }.flatten()
-
-        //processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, "c = ${typeConverters.joinToString()}")
-
-        val roomDatabase = ClassName("androidx.room", "RoomDatabase")
-        val selective = TypeSpec.classBuilder("${daoName}Selective")
-                .primaryConstructor(FunSpec.constructorBuilder()
-                        .addParameter("__db", roomDatabase, KModifier.PRIVATE)
-                        .build())
-                .addProperty(PropertySpec.builder("__db", roomDatabase)
-                        .initializer("__db")
-                        .addModifiers(KModifier.PRIVATE)
-                        .build())
-
-        val usedTypeConverters = mutableSetOf<TypeConverter>()
-
-        processingEnv.elementUtils.getAllMembers(dao).forEach { element ->
-            if (element.kind != ElementKind.METHOD)
-                return@forEach
-            val method = element as ExecutableElement
-            val annotation = method.getAnnotation(UpdateSelective::class.java) ?: return@forEach
-            usedTypeConverters.addAll(processMethod(selective, method, annotation, typeConverters))
-        }
-
-        usedTypeConverters.forEach { converter ->
-            selective.addProperty(PropertySpec.builder("__${converter.converterType.simpleName}", converter.converterType.asType().asTypeName(), KModifier.PRIVATE)
-                    .delegate(CodeBlock.builder()
-                            .beginControlFlow("lazy")
-                            .addStatement("%T()", converter.converterType.asType().asTypeName())
-                            .endControlFlow()
-                            .build())
-                    .build())
-        }
-
-        FileSpec.builder(packageName, "${daoName}Selective")
-                .addType(selective.build())
-                .build()
-                .writeTo(file)
-    }
-
-    private fun VariableElement.name() = getAnnotation(ColumnInfo::class.java)?.name ?: simpleName.toString()
-
-    private fun processMethod(cls: TypeSpec.Builder, method: ExecutableElement, annotation: UpdateSelective, typeConverters: List<TypeConverter>): List<TypeConverter> {
-        val methodName = method.simpleName.toString()
-        val parameter = method.parameters.first()
-        val paramName = parameter.simpleName.toString()
-        val paramTypeElement = processingEnv.typeUtils.asElement(parameter.asType()) as TypeElement
-        val paramTypeAnnotation = paramTypeElement.getAnnotation(Entity::class.java)
-
-        val tableName = paramTypeAnnotation.tableName
-        val primaryKeys = annotation.primaryKeys
-        val skippedColumns = annotation.skippedColumns
-
-
-        var members = processingEnv.elementUtils.getAllMembers(paramTypeElement)
-        val allFields = ElementFilter.fieldsIn(members)
-
-        // check all super classes
-        var superType = paramTypeElement.superclass
-        while (superType !is NoType) {
-            val superTypeElement = processingEnv.typeUtils.asElement(superType) as TypeElement
-            members = processingEnv.elementUtils.getAllMembers(superTypeElement)
-            allFields += ElementFilter.fieldsIn(members)
-            superType = superTypeElement.superclass
-        }
-
-        allFields.removeAll { skippedColumns.contains(it.name()) }
-        allFields.removeAll { it.getAnnotation(Ignore::class.java) != null }
-        allFields.removeAll { field -> field.modifiers.any { it == Modifier.STATIC } }
-        val allFieldsDistinct = allFields.distinct()
-
-        // dump fields
-        //processingEnv.messager.printMessage(Diagnostic.Kind.ERROR, allFieldsDistinct.joinToString())
-
-        val fields = allFieldsDistinct.filterNot { primaryKeys.contains(it.name()) }
-        val primaryFields = allFieldsDistinct.filter { primaryKeys.contains(it.name()) }
-        val fieldNames = fields.map { it.name() }
-        val primaryFieldNames = primaryFields.map { it.name() }
-
-        val fieldNamesQuery = fieldNames.joinToString { "$it = ?" }
-        val primaryFieldNamesQuery = primaryFieldNames.joinToString(" AND ") { "$it = ?" }
-        val query = "\"\"\"UPDATE $tableName SET $fieldNamesQuery WHERE $primaryFieldNamesQuery\"\"\""
-
-        val entityInsertionAdapter = ClassName("androidx.room", "EntityInsertionAdapter")
-        val supportSQLiteStatement = ClassName("androidx.sqlite.db", "SupportSQLiteStatement")
-
-        val usedTypeConverters = mutableListOf<TypeConverter>()
-
-        val bind = CodeBlock.builder()
-        (fields+primaryFields).forEachIndexed { i, field ->
-            val index = i+1
-            val fieldName = field.simpleName.toString()
-            val name = "${paramName}_$fieldName"
-            val realName = "${paramName}.$fieldName"
-            val nullable = field.getAnnotation(org.jetbrains.annotations.Nullable::class.java) != null
-
-            var param = when (field.asType().kind) {
-                TypeKind.BOOLEAN -> "if ($name) 1L else 0L"
-                TypeKind.BYTE,
-                TypeKind.SHORT,
-                TypeKind.INT -> "$name.toLong()"
-                TypeKind.CHAR -> "$name.toString()"
-                TypeKind.FLOAT -> "$name.toDouble()"
-                else -> when (field.asType().toString()) {
-                    "java.lang.String" -> name
-                    "java.lang.Boolean" -> "if ($name == true) 1L else 0L"
-                    "java.lang.Byte",
-                    "java.lang.Short",
-                    "java.lang.Integer" -> "$name.toLong()"
-                    "java.lang.Long" -> name
-                    "java.lang.Char" -> "$name.toString()"
-                    "java.lang.Float" -> "$name.toDouble()"
-                    "java.lang.Double" -> name
-                    else -> name
-                }
-            }
-
-            var isConvert = false
-            val bindMethod = when (field.asType().kind) {
-                TypeKind.BOOLEAN -> "bindLong"
-                TypeKind.BYTE -> "bindLong"
-                TypeKind.SHORT -> "bindLong"
-                TypeKind.INT -> "bindLong"
-                TypeKind.LONG -> "bindLong"
-                TypeKind.CHAR -> "bindString"
-                TypeKind.FLOAT -> "bindDouble"
-                TypeKind.DOUBLE -> "bindDouble"
-                else -> when (field.asType().toString()) {
-                    "java.lang.String" -> "bindString"
-                    "java.lang.Boolean" -> "bindLong"
-                    "java.lang.Byte" -> "bindLong"
-                    "java.lang.Short" -> "bindLong"
-                    "java.lang.Integer" -> "bindLong"
-                    "java.lang.Long" -> "bindLong"
-                    "java.lang.Char" -> "bindString"
-                    "java.lang.Float" -> "bindDouble"
-                    "java.lang.Double" -> "bindDouble"
-                    else -> {
-                        val converter = typeConverters.firstOrNull {
-                            it.dataType.toString() == field.asType().toString()
-                        }
-                        if (converter != null) {
-                            param = "__${converter.converterType.simpleName}.${converter.methodName}($realName)"
-                            param = when (converter.returnType.toString()) {
-                                "java.lang.Integer", "int",
-                                "java.lang.Short", "short",
-                                "java.lang.Byte", "byte" -> "$param.toLong()"
-                                "java.lang.Boolean", "boolean" -> "if ($param) 1L else 0L"
-                                "java.lang.Char", "char" -> "$param.toString()"
-                                "java.lang.Float", "float" -> "$param.toDouble()"
-                                else -> param
-                            }
-                            isConvert = true
-                            usedTypeConverters += converter
-                            when (converter.returnType.toString()) {
-                                "java.lang.Integer", "int",
-                                "java.lang.Short", "short",
-                                "java.lang.Byte", "byte",
-                                "java.lang.Boolean", "boolean" -> "bindLong"
-                                "java.lang.Char", "char" -> "bindString"
-                                "java.lang.Float", "float" -> "bindDouble"
-                                else -> "bindString"
-                            }
-                        }
-                        else "bind${field.asType()}"
-                    }
-                }
-            }
-
-            if (!isConvert) {
-                bind.addStatement("val $name = $realName")
-            }
-            else {
-                bind.addStatement("val $name = $param")
-                param = name
-            }
-            if (nullable) {
-                bind.beginControlFlow("if ($name == null)")
-                        .addStatement("stmt.bindNull($index)")
-                        .endControlFlow()
-                        .beginControlFlow("else")
-                        .addStatement("stmt.$bindMethod($index, $param)")
-                        .endControlFlow()
-            }
-            else {
-                bind.addStatement("stmt.$bindMethod($index, $param)")
-            }
-        }
-
-        val adapterName = "__insertionAdapterOf$methodName"
-        val delegate = CodeBlock.builder().add("""
-            |lazy {
-            |    object : EntityInsertionAdapter<%T>(__db) {
-            |        override fun createQuery() = $query
-            |        override fun bind(stmt: %T, $paramName: %T) {
-            |${bind.indent().indent().indent().build()}
-            |        }
-            |    }
-            |}""".trimMargin(), paramTypeElement.asClassName(), supportSQLiteStatement, paramTypeElement.asClassName())
-
-        cls.addProperty(PropertySpec.builder(adapterName, entityInsertionAdapter.parameterizedBy(paramTypeElement.asClassName()), KModifier.PRIVATE)
-                .delegate(delegate.build())
-                .build())
-
-        val list = ClassName("kotlin.collections", "List")
-        val longArray = ClassName("kotlin", "LongArray")
-
-        val function = FunSpec.builder(methodName)
-                .addModifiers(KModifier.INTERNAL)
-                .addParameter("item", parameter.asType().asTypeName())
-                .returns(Long::class.java)
-                .addStatement("__db.assertNotSuspendingTransaction()")
-                .addStatement("__db.beginTransaction()")
-                .addCode("""
-                    |try {
-                    |    val _result = $adapterName.insertAndReturnId(item)
-                    |    __db.setTransactionSuccessful()
-                    |    return _result
-                    |} finally {
-                    |    __db.endTransaction()
-                    |}
-                """.trimMargin())
-                .build()
-
-        val functionAll = FunSpec.builder(methodName+"All")
-                .addModifiers(KModifier.INTERNAL)
-                .addParameter("items", list.parameterizedBy(parameter.asType().asTypeName()))
-                .returns(longArray)
-                .addStatement("__db.assertNotSuspendingTransaction()")
-                .addStatement("__db.beginTransaction()")
-                .addCode("""
-                    |try {
-                    |    val _result = $adapterName.insertAndReturnIdsArray(items)
-                    |    __db.setTransactionSuccessful()
-                    |    return _result
-                    |} finally {
-                    |    __db.endTransaction()
-                    |}
-                """.trimMargin())
-                .build()
-
-        cls.addFunction(function)
-        cls.addFunction(functionAll)
-        return usedTypeConverters
-    }
-
-    override fun getSupportedAnnotationTypes(): MutableSet<String> {
-        return mutableSetOf(SelectiveDao::class.java.canonicalName)
-    }
-}
diff --git a/settings.gradle b/settings.gradle
index a1b55163..d7b33210 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,5 @@
 include ':wear'
 include ':wear'
-include ':codegen'
-include ':annotation'
 rootProject.name='Szkolny.eu'
 include ':app'
 /*