diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php
index c8a16a31d..5d88237ac 100644
--- a/lib/Activity/ActivityManager.php
+++ b/lib/Activity/ActivityManager.php
@@ -28,10 +28,11 @@ public function __construct(
 
 	/**
 	 * Publish a new-Share Activity
+	 *
 	 * @param Form $form The shared form
 	 * @param string $shareeId UserId, the form has been shared to
 	 */
-	public function publishNewShare(Form $form, string $shareeId) {
+	public function publishNewShare(Form $form, string $shareeId): void {
 		$event = $this->manager->generateEvent();
 		$event->setApp($this->appName)
 			->setType(ActivityConstants::TYPE_NEWSHARE)
@@ -49,10 +50,11 @@ public function publishNewShare(Form $form, string $shareeId) {
 
 	/**
 	 * Publish a new-GroupShare Activity to each affected user
+	 *
 	 * @param Form $form The shared form
 	 * @param string $groupId Group the form has been shared to
 	 */
-	public function publishNewGroupShare(Form $form, string $groupId) {
+	public function publishNewGroupShare(Form $form, string $groupId): void {
 		$affectedUsers = $this->groupManager->get($groupId)->getUsers();
 
 		foreach ($affectedUsers as $user) {
@@ -79,7 +81,7 @@ public function publishNewGroupShare(Form $form, string $groupId) {
 	 * @param Form $form The shared form
 	 * @param string $circleId Circle the form has been shared to
 	 */
-	public function publishNewCircleShare(Form $form, string $circleId) {
+	public function publishNewCircleShare(Form $form, string $circleId): void {
 		$users = $this->circlesService->getCircleUsers($circleId);
 
 		foreach ($users as $user) {
@@ -102,10 +104,11 @@ public function publishNewCircleShare(Form $form, string $circleId) {
 
 	/**
 	 * Publish a new-Submission Activity
+	 *
 	 * @param Form $form The affected Form
 	 * @param string $submitterID ID of the User who submitted the form. Can also be our 'anon-user-'-ID
 	 */
-	public function publishNewSubmission(Form $form, string $submitterID) {
+	public function publishNewSubmission(Form $form, string $submitterID): void {
 		$event = $this->manager->generateEvent();
 		$event->setApp($this->appName)
 			->setType(ActivityConstants::TYPE_NEWSUBMISSION)
@@ -127,7 +130,7 @@ public function publishNewSubmission(Form $form, string $submitterID) {
 	 * @param Form $form The affected Form
 	 * @param string $submitterID ID of the User who submitted the form. Can also be our 'anon-user-'-ID
 	 */
-	public function publishNewSharedSubmission(Form $form, int $shareType, string $shareWith, string $submitterID) {
+	public function publishNewSharedSubmission(Form $form, int $shareType, string $shareWith, string $submitterID): void {
 		$users = [];
 		switch ($shareType) {
 			case IShare::TYPE_USER:
diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
index 4072dedc1..d9a827f13 100644
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@@ -96,6 +96,8 @@ public function __construct(
 	// CORS preflight
 	/**
 	 * Handle CORS options request by calling parent function
+	 *
+	 * @return void
 	 */
 	#[ApiRoute(verb: 'OPTIONS', url: '/api/v3/{path}', requirements: ['path' => '.+'])]
 	public function preflightedCors() {
@@ -1527,7 +1529,7 @@ public function uploadFiles(int $formId, int $questionId, string $shareHash = ''
 	 * @param array $question
 	 * @param string[]|array<array{uploadedFileId: string, uploadedFileName: string}> $answerArray
 	 */
-	private function storeAnswersForQuestion(Form $form, $submissionId, array $question, array $answerArray) {
+	private function storeAnswersForQuestion(Form $form, $submissionId, array $question, array $answerArray): void {
 		foreach ($answerArray as $answer) {
 			$answerEntity = new Answer();
 			$answerEntity->setSubmissionId($submissionId);
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 71b5ebe47..8dc1ae1dc 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -248,8 +248,10 @@ protected function insertHeaderOnIos(): void {
 
 	/**
 	 * Set CSP options to allow the page be embedded using <iframe>
+	 *
+	 * @return TemplateResponse
 	 */
-	protected function setEmbeddedCSP(TemplateResponse $response) {
+	protected function setEmbeddedCSP(TemplateResponse $response): TemplateResponse {
 		$policy = new ContentSecurityPolicy();
 		$policy->addAllowedFrameAncestorDomain('*');
 
diff --git a/lib/Db/Form.php b/lib/Db/Form.php
index ffb45d987..77fcf1e7f 100644
--- a/lib/Db/Form.php
+++ b/lib/Db/Form.php
@@ -108,7 +108,7 @@ public function getAccess(): array {
 	/**
 	 * @param FormsAccess $access
 	 */
-	public function setAccess(array $access) {
+	public function setAccess(array $access): void {
 		// No further permissions -> 0
 		// Permit all users, but don't show in navigation -> 1
 		// Permit all users and show in navigation -> 2
diff --git a/lib/Db/Question.php b/lib/Db/Question.php
index 8982ed1bd..e5e226cf8 100644
--- a/lib/Db/Question.php
+++ b/lib/Db/Question.php
@@ -63,7 +63,7 @@ public function getExtraSettings(): array {
 	/**
 	 * @param FormsQuestionExtraSettings $extraSettings
 	 */
-	public function setExtraSettings(array $extraSettings) {
+	public function setExtraSettings(array $extraSettings): void {
 		// Remove extraSettings that are not set
 		foreach ($extraSettings as $key => $value) {
 			if ($value === false) {
diff --git a/lib/Db/Share.php b/lib/Db/Share.php
index 4bcaf85bf..9859933fb 100644
--- a/lib/Db/Share.php
+++ b/lib/Db/Share.php
@@ -52,7 +52,7 @@ public function getPermissions(): array {
 	/**
 	 * @param list<FormsPermission> $permissions
 	 */
-	public function setPermissions(array $permissions) {
+	public function setPermissions(array $permissions): void {
 		$this->setPermissionsJson(
 			// Make sure to only encode array values as the indices might be non consecutively so it would be encoded as a json object
 			json_encode($permissions)
diff --git a/lib/Migration/Version010200Date20200323141300.php b/lib/Migration/Version010200Date20200323141300.php
index 1e0533ae0..3d4200353 100644
--- a/lib/Migration/Version010200Date20200323141300.php
+++ b/lib/Migration/Version010200Date20200323141300.php
@@ -190,6 +190,9 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 		return $schema;
 	}
 
+	/**
+	 * @return void
+	 */
 	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
diff --git a/lib/Migration/Version020202Date20210311150843.php b/lib/Migration/Version020202Date20210311150843.php
index c14b74e81..a447b081d 100644
--- a/lib/Migration/Version020202Date20210311150843.php
+++ b/lib/Migration/Version020202Date20210311150843.php
@@ -28,9 +28,12 @@ public function __construct(IDBConnection $connection) {
 
 	/**
 	 * Update old Access-Objects to be full objects containing (empty) user- and group-key.
+	 *
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
 	 * @param array $options
+	 *
+	 * @return void
 	 */
 	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
 		$qb_fetch = $this->connection->getQueryBuilder();
diff --git a/lib/Migration/Version020300Date20210406114130.php b/lib/Migration/Version020300Date20210406114130.php
index 4af1f5bac..2529afd6a 100644
--- a/lib/Migration/Version020300Date20210406114130.php
+++ b/lib/Migration/Version020300Date20210406114130.php
@@ -50,11 +50,14 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		return null;
 	}
 
+	/**
+	 * @return void
+	 */
 	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
 		$qb_update = $this->connection->getQueryBuilder();
 
 		$qb_update->update('forms_v2_questions')
 			->set('is_required', 'mandatory');
-		$qb_update->execute();
+		$qb_update->executeStatement();
 	}
 }
diff --git a/lib/Migration/Version040200Date20240219201500.php b/lib/Migration/Version040200Date20240219201500.php
index 850fe2bcc..d2d238784 100644
--- a/lib/Migration/Version040200Date20240219201500.php
+++ b/lib/Migration/Version040200Date20240219201500.php
@@ -51,6 +51,8 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 	/**
 	 * Set all old forms to active state
+	 *
+	 * @return void
 	 */
 	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
 		$query = $this->db->getQueryBuilder();
diff --git a/lib/Service/FormsService.php b/lib/Service/FormsService.php
index e07664009..fa468ff8d 100644
--- a/lib/Service/FormsService.php
+++ b/lib/Service/FormsService.php
@@ -609,7 +609,7 @@ private function getSharesWithUser(int $formId, string $userId): array {
 	 * @param string $questionType the question type
 	 * @return bool if the settings are valid
 	 */
-	public function areExtraSettingsValid(array $extraSettings, string $questionType) {
+	public function areExtraSettingsValid(array $extraSettings, string $questionType): bool {
 		if (count($extraSettings) === 0) {
 			return true;
 		}
diff --git a/psalm.xml b/psalm.xml
index 1f4f5af69..44851b400 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <psalm
 	errorLevel="4"
+	findUnusedBaselineEntry="true"
+	findUnusedCode="false"
 	resolveFromConfigFile="true"
 	totallyTyped="true"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 334cc26bf..e001f1f88 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,247 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.8.0@9cf4f60a333f779ad3bc704a555920e81d4fdcda">
-  <file src="lib/Activity/Provider.php">
-    <InvalidCatch>
-      <code><![CDATA[try {
-			// Overwrite formTitle if form is found (i.e. still exists).
-			$formTitle = $this->formMapper->findbyHash($formHash)->getTitle();
-
-			// Append hash and route
-			$formLink .= $formHash;
-			if ($route !== '') {
-				$formLink .= '/' . $route;
-			}
-		} catch (IMapperException $e) {
-			// Ignore if not found, just use stored title
-		}]]></code>
-    </InvalidCatch>
-  </file>
-  <file src="lib/AppInfo/Application.php">
-    <InvalidArgument>
-      <code>UserDeletedListener::class</code>
-    </InvalidArgument>
-  </file>
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
   <file src="lib/Controller/ApiController.php">
-    <InvalidCatch>
-      <code><![CDATA[try {
-				$questions[$arrayKey] = $this->questionMapper->findById($questionId);
-			} catch (IMapperException $e) {
-				$this->logger->debug('Could not find question. Id:{id}', [
-					'id' => $questionId
-				]);
-				throw new OCSBadRequestException();
-			}]]></code>
-      <code><![CDATA[try {
-			$form = $this->formMapper->findByHash($hash);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}]]></code>
-      <code><![CDATA[try {
-			$form = $this->formMapper->findByHash($hash);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}]]></code>
-      <code><![CDATA[try {
-			$form = $this->formMapper->findByHash($hash);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}]]></code>
-      <code><![CDATA[try {
-			$form = $this->formMapper->findByHash($hash);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}]]></code>
-      <code><![CDATA[try {
-			$form = $this->formMapper->findById($formId);
-			$questions = $this->formsService->getQuestions($formId);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}]]></code>
-      <code><![CDATA[try {
-			$form = $this->formMapper->findById($formId);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}]]></code>
-      <code><![CDATA[try {
-			$form = $this->formMapper->findById($formId);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}]]></code>
-      <code><![CDATA[try {
-			$form = $this->formMapper->findById($formId);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}]]></code>
-      <code><![CDATA[try {
-			$form = $this->formMapper->findById($id);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}]]></code>
-      <code><![CDATA[try {
-			$form = $this->formMapper->findById($id);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}]]></code>
-      <code><![CDATA[try {
-			$form = $this->formsService->getForm($id);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}]]></code>
-      <code><![CDATA[try {
-			$oldForm = $this->formMapper->findById($id);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form');
-			throw new OCSBadRequestException();
-		}]]></code>
-      <code><![CDATA[try {
-			$option = $this->optionMapper->findById($id);
-			$question = $this->questionMapper->findById($option->getQuestionId());
-			$form = $this->formMapper->findById($question->getFormId());
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form or option');
-			throw new OCSBadRequestException('Could not find form or option');
-		}]]></code>
-      <code><![CDATA[try {
-			$option = $this->optionMapper->findById($id);
-			$question = $this->questionMapper->findById($option->getQuestionId());
-			$form = $this->formMapper->findById($question->getFormId());
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find option, question or form');
-			throw new OCSBadRequestException('Could not find option, question or form');
-		}]]></code>
-      <code><![CDATA[try {
-			$question = $this->questionMapper->findById($id);
-			$form = $this->formMapper->findById($question->getFormId());
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form or question');
-			throw new OCSBadRequestException('Could not find form or question');
-		}]]></code>
-      <code><![CDATA[try {
-			$question = $this->questionMapper->findById($id);
-			$form = $this->formMapper->findById($question->getFormId());
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form or question');
-			throw new OCSBadRequestException('Could not find form or question');
-		}]]></code>
-      <code><![CDATA[try {
-			$question = $this->questionMapper->findById($questionId);
-			$form = $this->formMapper->findById($question->getFormId());
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form or question');
-			throw new OCSBadRequestException('Could not find form or question');
-		}]]></code>
-      <code><![CDATA[try {
-			$submission = $this->submissionMapper->findById($id);
-			$form = $this->formMapper->findById($submission->getFormId());
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form or submission');
-			throw new OCSBadRequestException();
-		}]]></code>
-    </InvalidCatch>
-  </file>
-  <file src="lib/Controller/ShareApiController.php">
-    <InvalidCatch>
-      <code><![CDATA[try {
-			$form = $this->formMapper->findById($formId);
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find form', ['exception' => $e]);
-			throw new OCSBadRequestException('Could not find form');
-		}]]></code>
-      <code><![CDATA[try {
-			$share = $this->shareMapper->findById($id);
-			$form = $this->formMapper->findById($share->getFormId());
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find share', ['exception' => $e]);
-			throw new OCSBadRequestException('Could not find share');
-		}]]></code>
-      <code><![CDATA[try {
-			$share = $this->shareMapper->findById($id);
-			$form = $this->formMapper->findById($share->getFormId());
-		} catch (IMapperException $e) {
-			$this->logger->debug('Could not find share', ['exception' => $e]);
-			throw new OCSBadRequestException('Could not find share');
-		}]]></code>
-    </InvalidCatch>
+    <RedundantCondition>
+      <code><![CDATA[method_exists($this->mimeTypeDetector, 'getAllMappings')]]></code>
+    </RedundantCondition>
   </file>
   <file src="lib/Db/Form.php">
     <UndefinedMagicMethod>
-      <code>getAccessEnum</code>
-      <code>setAccessEnum</code>
+      <code><![CDATA[getAccessEnum]]></code>
+      <code><![CDATA[setAccessEnum]]></code>
     </UndefinedMagicMethod>
   </file>
   <file src="lib/Db/Question.php">
     <UndefinedMagicMethod>
-      <code>getExtraSettingsJson</code>
-      <code>setExtraSettingsJson</code>
+      <code><![CDATA[getExtraSettingsJson]]></code>
+      <code><![CDATA[setExtraSettingsJson]]></code>
     </UndefinedMagicMethod>
   </file>
   <file src="lib/Db/Share.php">
     <UndefinedMagicMethod>
-      <code>getPermissionsJson</code>
-      <code>setPermissionsJson</code>
+      <code><![CDATA[getPermissionsJson]]></code>
+      <code><![CDATA[setPermissionsJson]]></code>
     </UndefinedMagicMethod>
   </file>
-  <file src="lib/FormsMigrator.php">
-    <UndefinedClass>
-      <code>OutputInterface</code>
-      <code>OutputInterface</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Middleware/PublicCorsMiddleware.php">
-    <NoInterfaceProperties>
-      <code><![CDATA[$this->request->server]]></code>
-    </NoInterfaceProperties>
-    <UndefinedClass>
-      <code>SecurityException</code>
-      <code>SecurityException</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass>
-      <code>SecurityException</code>
-    </UndefinedDocblockClass>
-  </file>
   <file src="lib/Migration/Version020300Date20210403214012.php">
     <InvalidOperand>
-      <code>$result</code>
+      <code><![CDATA[$result]]></code>
       <code><![CDATA[$this->ensureColumnIsNullable($schema, 'forms_v2_questions', 'mandatory')]]></code>
     </InvalidOperand>
   </file>
   <file src="lib/Migration/Version030000Date20220402100057.php">
     <UndefinedClass>
-      <code>Type</code>
+      <code><![CDATA[Type]]></code>
     </UndefinedClass>
   </file>
   <file src="lib/Migration/Version030100Date20230115214242.php">
     <InvalidOperand>
-      <code>$result</code>
+      <code><![CDATA[$result]]></code>
       <code><![CDATA[$this->ensureColumnIsNullable($schema, 'forms_v2_options', 'text')]]></code>
       <code><![CDATA[$this->ensureColumnIsNullable($schema, 'forms_v2_questions', 'order')]]></code>
       <code><![CDATA[$this->ensureColumnIsNullable($schema, 'forms_v2_questions', 'text')]]></code>
       <code><![CDATA[$this->ensureColumnIsNullable($schema, 'forms_v2_shares', 'share_type')]]></code>
     </InvalidOperand>
   </file>
-  <file src="lib/Service/FormsService.php">
-    <InvalidThrow>
-      <code>IMapperException</code>
-      <code>IMapperException</code>
-      <code>IMapperException</code>
-    </InvalidThrow>
-  </file>
-  <file src="lib/Service/SubmissionService.php">
-    <MissingDependency>
-      <code><![CDATA[$this->storage]]></code>
-      <code>IRootFolder</code>
-      <code>IRootFolder</code>
-    </MissingDependency>
-  </file>
 </files>