diff --git a/Classes/Service/BackendService.php b/Classes/Service/BackendService.php
index cf2f388ea2b5f4c97915c3f17a131391800679bb..4121b9985c0321414b482002b46a00643b749c85 100644
--- a/Classes/Service/BackendService.php
+++ b/Classes/Service/BackendService.php
@@ -102,10 +102,9 @@ class BackendService {
 	/**
 	 * Retrieves the next site root in the page hierarchy from the current page
 	 *
-	 * @param $currentPid
 	 * @return int
 	 */
-	public static function getSiteRoot($currentPid) {
+	public static function getSiteRoot() {
 		$rootLine = BackendUtility::BEgetRootLine((int) GeneralUtility::_GP('id'));
 		$siteRoot = [];
 
diff --git a/Classes/Service/FormhandlerFinisherService.php b/Classes/Service/FormhandlerFinisherService.php
index 22b7e65309978f31ed286979f876ea86f790435e..319fc75b8fd66309789214880483a024e822a506 100644
--- a/Classes/Service/FormhandlerFinisherService.php
+++ b/Classes/Service/FormhandlerFinisherService.php
@@ -69,6 +69,8 @@ class FormhandlerFinisherService extends AbstractFinisher {
 	 *  Needed to hook into Formhandler
 	 *
 	 * @return array $gp
+	 * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
+	 * @throws \InvalidArgumentException
 	 */
 	public function process() {
 		if (!isset($this->settings['to_address'])) {
@@ -92,12 +94,4 @@ class FormhandlerFinisherService extends AbstractFinisher {
 
 		return $this->gp;
 	}
-
-	/**
-	 * Needed to hook into Formhandler
-	 * simply returns true
-	 */
-	public function validateConfig() {
-		parent::validateConfig();
-	}
 }
diff --git a/Classes/Service/TypoScriptSettingsService.php b/Classes/Service/TypoScriptSettingsService.php
index b4d5ad1f71c0e42d06152a0f247145ad3e4e09ea..9a9f91450ea9a3ba58abe15cbb4c521febe4490a 100644
--- a/Classes/Service/TypoScriptSettingsService.php
+++ b/Classes/Service/TypoScriptSettingsService.php
@@ -60,11 +60,11 @@ class TypoScriptSettingsService implements SingletonInterface {
 			$_POST['id'] = $pageId;
 
 			/** @var TypoScriptService $typoScriptService */
-			$class = 'TYPO3\CMS\Extbase\Service\TypoScriptService';
+			$class = TypoScriptService::class;
 			$typoScriptService = $this->objectManager->get($class);
 
 			/** @var BackendConfigurationManager $configurationManager */
-			$class = 'TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager';
+			$class = BackendConfigurationManager::class;
 			$configurationManager = $this->objectManager->get($class);
 
 			self::$typoScriptCache[$extensionKey . $pageId] = $typoScriptService->convertTypoScriptArrayToPlainArray(