diff --git a/CITATION.cff b/CITATION.cff
new file mode 100644
index 00000000..a3e02380
--- /dev/null
+++ b/CITATION.cff
@@ -0,0 +1,38 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://bit.ly/cffinit to generate yours today!
+
+cff-version: 1.2.0
+title: 'AirGuard for Android: Tracking Protection'
+message: 'If you use this software, please cite it as below.'
+type: software
+authors:
+  - given-names: Niklas
+    family-names: Bittner
+    affiliation: 'SEEMOO, TU Darmstadt'
+  - given-names: Alexander
+    family-names: Heinrich
+    affiliation: 'SEEMOO, TU Darmstadt'
+    orcid: 'https://orcid.org/0000-0002-1150-1922'
+  - given-names: Dennis
+    family-names: Arndt
+    affiliation: 'SEEMOO, TU Darmstadt'
+  - given-names: Matthias
+    family-names: Hollick
+    affiliation: 'SEEMOO, TU Darmstadt'
+    orcid: 'https://orcid.org/0000-0002-9163-5989'
+repository-code: 'https://github.com/seemoo-lab/AirGuard'
+abstract: >-
+  The AirTags and other Find My devices are simple, small
+  and perfect to track Android users! Without tracking
+  warnings, as integrated on iOS, anyone could try to track
+  your behavior by placing an AirTag in your jacket,
+  backpack or car.
+keywords:
+  - Android
+  - Bluetooth Tracker
+  - Tracking Protection
+  - Stalking
+license: Apache-2.0
+commit: dd3e954861f0cf9a7c98c58e08de44a6573de7f7
+version: '2.2'
+date-released: '2024-06-11'
diff --git a/app/src/main/java/de/seemoo/at_tracking_detection/database/models/device/types/Tile.kt b/app/src/main/java/de/seemoo/at_tracking_detection/database/models/device/types/Tile.kt
index 72a15ae6..a1fe3af3 100644
--- a/app/src/main/java/de/seemoo/at_tracking_detection/database/models/device/types/Tile.kt
+++ b/app/src/main/java/de/seemoo/at_tracking_detection/database/models/device/types/Tile.kt
@@ -38,6 +38,9 @@ class Tile(val id: Int) : Device(){
         override val websiteManufacturer: String
             get() = "https://www.tile.com/"
 
+        override val websiteManufacturer: String
+            get() = "https://www.tile.com/"
+
         override val statusByteDeviceType: UInt
             get() = 0u
 
diff --git a/app/src/main/java/de/seemoo/at_tracking_detection/detection/TrackingDetectorWorker.kt b/app/src/main/java/de/seemoo/at_tracking_detection/detection/TrackingDetectorWorker.kt
index 22b7c462..4794d1a1 100644
--- a/app/src/main/java/de/seemoo/at_tracking_detection/detection/TrackingDetectorWorker.kt
+++ b/app/src/main/java/de/seemoo/at_tracking_detection/detection/TrackingDetectorWorker.kt
@@ -34,6 +34,8 @@ class TrackingDetectorWorker @AssistedInject constructor(
 ) : CoroutineWorker(appContext, workerParams) {
 
     override suspend fun doWork(): Result {
+        deleteOldAndSafeTrackers()
+
         Timber.d("Tracking detection background job started!")
         // Just writing a new comment in here.
         val ignoredDevices = deviceRepository.ignoredDevicesSync