diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index 0980ed93..a9134f7d 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -12,6 +12,7 @@
 use OC;
 use OC\DB\Connection;
 use OC\DB\SchemaWrapper;
+use OCA\FilesLock\Cron\Unlock;
 
 /**
  * Class CoreRequestBuilder
@@ -57,7 +58,7 @@ public function uninstallAppTables() {
 		$dbConn = OC::$server->get(Connection::class);
 		$schema = new SchemaWrapper($dbConn);
 
-		foreach (array_keys(self::$tables) as $table) {
+		foreach (self::$tables as $table) {
 			if ($schema->hasTable($table)) {
 				$schema->dropTable($table);
 			}
@@ -73,8 +74,7 @@ public function uninstallAppTables() {
 	public function removeFromMigrations() {
 		$qb = $this->getQueryBuilder();
 		$qb->delete('migrations');
-		$qb->where($qb->exprLimitToDBField('app', 'files_lock', true, true));
-
+		$qb->where($qb->exprLimit('app', 'files_lock'));
 		$qb->executeStatement();
 	}
 
@@ -84,7 +84,7 @@ public function removeFromMigrations() {
 	public function removeFromJobs() {
 		$qb = $this->getQueryBuilder();
 		$qb->delete('jobs');
-		$qb->where($qb->exprLimitToDBField('class', 'OCA\FilesLock\Cron\Unlock', true, true));
+		$qb->where($qb->exprLimit('class', Unlock::class));
 		$qb->executeStatement();
 	}
 }