diff --git a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
index 46ed58df4f..a105daa260 100644
--- a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
+++ b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
@@ -78,7 +78,7 @@ class BirthdayCalendarControllerTest extends TestCase {
 			->with('dav', 'generateBirthdayCalendar', 'yes');
 
 		$this->userManager->expects($this->once())
-			->method('callForAllUsers')
+			->method('callForSeenUsers')
 			->will($this->returnCallback(function($closure) {
 				$user1 = $this->createMock(IUser::class);
 				$user1->method('getUID')->will($this->returnValue('uid1'));
diff --git a/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php b/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php
index 05e12bbda6..74af6af88d 100644
--- a/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php
+++ b/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php
@@ -76,7 +76,7 @@ class RegenerateBirthdayCalendarsTest extends TestCase {
 			->with('Adding background jobs to regenerate birthday calendar');
 
 		$this->userManager->expects($this->once())
-			->method('callForAllUsers')
+			->method('callForSeenUsers')
 			->will($this->returnCallback(function($closure) {
 				$user1 = $this->createMock(IUser::class);
 				$user1->method('getUID')->will($this->returnValue('uid1'));
@@ -128,10 +128,10 @@ class RegenerateBirthdayCalendarsTest extends TestCase {
 			->with('Repair step already executed');
 
 		$this->userManager->expects($this->never())
-			->method('callForAllUsers');
+			->method('callForSeenUsers');
 
 		$this->migration->run($output);
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php
index 905a199a1a..27dcb2fc33 100644
--- a/lib/private/User/Database.php
+++ b/lib/private/User/Database.php
@@ -59,7 +59,6 @@ namespace OC\User;
 
 use OC\Cache\CappedMemoryCache;
 use OCP\IDBConnection;
-use OCP\ILogger;
 use OCP\User\Backend\ABackend;
 use OCP\User\Backend\ICheckPasswordBackend;
 use OCP\User\Backend\ICountUsersBackend;
@@ -68,7 +67,6 @@ use OCP\User\Backend\IGetDisplayNameBackend;
 use OCP\User\Backend\IGetHomeBackend;
 use OCP\User\Backend\ISetDisplayNameBackend;
 use OCP\User\Backend\ISetPasswordBackend;
-use OCP\Util;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\GenericEvent;