diff --git a/includes/Menu/Definitions.php b/includes/Menu/Definitions.php
index 15c26d777..63330bea3 100644
--- a/includes/Menu/Definitions.php
+++ b/includes/Menu/Definitions.php
@@ -27,7 +27,6 @@ use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserOptionsLookup;
 use Message;
-use MWException;
 use SpecialPage;
 use Title;
 
@@ -83,7 +82,6 @@ final class Definitions {
 	 * @param string $className Optional HTML classes
 	 * @param string|null $icon defaults to $name if not specified
 	 * @param bool $trackable Whether an entry will track clicks or not. Default is false.
-	 * @throws MWException
 	 * @return SingleMenuEntry
 	 */
 	private function buildMenuEntry( $name, $text, $url, $className = '', $icon = null, $trackable = false ) {
@@ -96,7 +94,6 @@ final class Definitions {
 	 * Creates a login or logout button with a profile button.
 	 *
 	 * @param Group $group
-	 * @throws MWException
 	 */
 	public function insertAuthMenuItem( Group $group ) {
 		$group->insertEntry( new AuthMenuEntry(
@@ -118,7 +115,6 @@ final class Definitions {
 	/**
 	 * If Nearby is supported, build and inject the Nearby link
 	 * @param Group $group
-	 * @throws MWException
 	 */
 	public function insertNearbyIfSupported( Group $group ) {
 		// Nearby link (if supported)
@@ -140,7 +136,6 @@ final class Definitions {
 	/**
 	 * Build and insert the Settings link
 	 * @param Group $group
-	 * @throws MWException
 	 */
 	public function insertMobileOptionsItem( Group $group ) {
 		$title = $this->context->getTitle();
@@ -177,7 +172,6 @@ final class Definitions {
 	/**
 	 * Build and insert the Preferences link
 	 * @param Group $group
-	 * @throws MWException
 	 */
 	public function insertPreferencesItem( Group $group ) {
 		$entry = $this->buildMenuEntry(
@@ -229,7 +223,6 @@ final class Definitions {
 	/**
 	 * Build and insert the RecentChanges link
 	 * @param Group $group
-	 * @throws MWException
 	 */
 	public function insertRecentChanges( Group $group ) {
 		$entry = $this->buildMenuEntry(
@@ -246,7 +239,6 @@ final class Definitions {
 	/**
 	 * Build and insert the SpecialPages link
 	 * @param Group $group
-	 * @throws MWException
 	 */
 	public function insertSpecialPages( Group $group ) {
 		$entry = $this->buildMenuEntry(
@@ -263,7 +255,6 @@ final class Definitions {
 	/**
 	 * Build and insert the CommunityPortal link
 	 * @param Group $group
-	 * @throws MWException
 	 */
 	public function insertCommunityPortal( Group $group ) {
 		$msg = $this->context->msg( 'portal' );
@@ -329,7 +320,6 @@ final class Definitions {
 	 * Insert the Donate Link in the Mobile Menu.
 	 *
 	 * @param Group $group
-	 * @throws MWException
 	 */
 	public function insertDonateItem( Group $group ) {
 		$labelMsg = $this->context->msg( 'sitesupport' );
diff --git a/includes/Menu/Main/AdvancedMainMenuBuilder.php b/includes/Menu/Main/AdvancedMainMenuBuilder.php
index 7bc320ad0..f10819a6f 100644
--- a/includes/Menu/Main/AdvancedMainMenuBuilder.php
+++ b/includes/Menu/Main/AdvancedMainMenuBuilder.php
@@ -20,10 +20,8 @@
 
 namespace MediaWiki\Minerva\Menu\Main;
 
-use FatalError;
 use MediaWiki\Minerva\Menu\Definitions;
 use MediaWiki\Minerva\Menu\Group;
-use MWException;
 
 /**
  * A menu builder that provides additional menu entries that match
@@ -91,8 +89,6 @@ final class AdvancedMainMenuBuilder implements IMainMenuBuilder {
 
 	/**
 	 * @inheritDoc
-	 * @throws FatalError
-	 * @throws MWException
 	 */
 	public function getSiteLinks(): Group {
 		return BuilderUtil::getSiteLinks( $this->definitions );
@@ -101,8 +97,6 @@ final class AdvancedMainMenuBuilder implements IMainMenuBuilder {
 	/**
 	 * Prepares a list of links that have the purpose of discovery in the main navigation menu
 	 * @return Group
-	 * @throws FatalError
-	 * @throws MWException
 	 */
 	public function getInteractionToolsGroup(): Group {
 		$group = new Group( 'p-interaction' );
diff --git a/includes/Menu/Main/BuilderUtil.php b/includes/Menu/Main/BuilderUtil.php
index c1b134ffe..86893e09f 100644
--- a/includes/Menu/Main/BuilderUtil.php
+++ b/includes/Menu/Main/BuilderUtil.php
@@ -20,11 +20,9 @@
 
 namespace MediaWiki\Minerva\Menu\Main;
 
-use FatalError;
 use MediaWiki\Minerva\Menu\Definitions;
 use MediaWiki\Minerva\Menu\Entries\SingleMenuEntry;
 use MediaWiki\Minerva\Menu\Group;
-use MWException;
 use SpecialPage;
 use Title;
 
@@ -39,8 +37,6 @@ final class BuilderUtil {
 	 * @param Definitions $definitions A menu items definitions set
 	 * @param bool $includeDonateLink whether to include it or not.
 	 * @return Group
-	 * @throws FatalError
-	 * @throws MWException
 	 */
 	public static function getDonateGroup( Definitions $definitions, $includeDonateLink ): Group {
 		$group = new Group( 'p-donation' );
@@ -55,8 +51,6 @@ final class BuilderUtil {
 	 * @param Definitions $definitions A menu items definitions set
 	 * @param array $navigationTools
 	 * @return Group
-	 * @throws FatalError
-	 * @throws MWException
 	 */
 	public static function getDiscoveryTools(
 		Definitions $definitions,
@@ -124,7 +118,6 @@ final class BuilderUtil {
 	 * @param Definitions $definitions A menu items definitions set
 	 * @param bool $showMobileOptions Show MobileOptions instead of Preferences
 	 * @return Group
-	 * @throws MWException
 	 */
 	public static function getConfigurationTools(
 		Definitions $definitions, $showMobileOptions
@@ -142,7 +135,6 @@ final class BuilderUtil {
 	 * Returns an array of sitelinks to add into the main menu footer.
 	 * @param Definitions $definitions A menu items definitions set
 	 * @return Group Collection of site links
-	 * @throws MWException
 	 */
 	public static function getSiteLinks( Definitions $definitions ): Group {
 		$group = new Group( 'p-minerva-sitelinks' );
diff --git a/includes/Menu/Main/DefaultMainMenuBuilder.php b/includes/Menu/Main/DefaultMainMenuBuilder.php
index b0acbf0d9..acda19643 100644
--- a/includes/Menu/Main/DefaultMainMenuBuilder.php
+++ b/includes/Menu/Main/DefaultMainMenuBuilder.php
@@ -24,7 +24,6 @@ use MediaWiki\Minerva\Menu\Definitions;
 use MediaWiki\Minerva\Menu\Entries\SingleMenuEntry;
 use MediaWiki\Minerva\Menu\Group;
 use MediaWiki\User\UserIdentity;
-use MWException;
 
 /**
  * Used to build default (available for everyone by default) main menu
@@ -90,7 +89,6 @@ final class DefaultMainMenuBuilder implements IMainMenuBuilder {
 
 	/**
 	 * @inheritDoc
-	 * @throws MWException
 	 */
 	public function getSiteLinks(): Group {
 		return BuilderUtil::getSiteLinks( $this->definitions );
diff --git a/includes/Menu/PageActions/PageActionsDirector.php b/includes/Menu/PageActions/PageActionsDirector.php
index 2613c5fa8..4d11a6090 100644
--- a/includes/Menu/PageActions/PageActionsDirector.php
+++ b/includes/Menu/PageActions/PageActionsDirector.php
@@ -21,7 +21,6 @@ namespace MediaWiki\Minerva\Menu\PageActions;
 
 use MediaWiki\Minerva\MinervaUI;
 use MessageLocalizer;
-use MWException;
 
 /**
  * Director responsible for building Page Actions menu.
@@ -66,7 +65,6 @@ final class PageActionsDirector {
 	 * @param array $toolbox An array of common toolbox items from the sidebar menu
 	 * @param array $actions An array of actions usually bucketed under the more menu
 	 * @return array
-	 * @throws MWException
 	 */
 	public function buildMenu( array $toolbox, array $actions ): array {
 		$toolbar = $this->toolbarBuilder->getGroup();
diff --git a/includes/Menu/PageActions/ToolbarBuilder.php b/includes/Menu/PageActions/ToolbarBuilder.php
index bc4ee097b..6a6830eb2 100644
--- a/includes/Menu/PageActions/ToolbarBuilder.php
+++ b/includes/Menu/PageActions/ToolbarBuilder.php
@@ -35,7 +35,6 @@ use MediaWiki\Minerva\Skins\SkinUserPageHelper;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\Watchlist\WatchlistManager;
 use MessageLocalizer;
-use MWException;
 use SpecialMobileHistory;
 use SpecialPage;
 use Title;
@@ -131,7 +130,6 @@ class ToolbarBuilder {
 
 	/**
 	 * @return Group
-	 * @throws MWException
 	 */
 	public function getGroup(): Group {
 		$group = new Group( 'p-views' );
@@ -201,8 +199,6 @@ class ToolbarBuilder {
 	 * editor with the lead section loaded.
 	 *
 	 * @return IMenuEntry An edit page actions menu entry
-	 * @throws MWException
-	 * @throws \Exception
 	 */
 	protected function createEditPageAction(): IMenuEntry {
 		$title = $this->title;
@@ -236,7 +232,6 @@ class ToolbarBuilder {
 	 * will direct the user's UA to Special:Login.
 	 *
 	 * @return IMenuEntry An watch/unwatch page actions menu entry
-	 * @throws MWException
 	 */
 	protected function createWatchPageAction(): IMenuEntry {
 		$isWatched = $this->user->isRegistered() &&
@@ -286,7 +281,6 @@ class ToolbarBuilder {
 	 *
 	 * @return IMenuEntry A menu entry object that represents a map of HTML attributes
 	 * and a 'text' property to be used with the pageActionMenu.mustache template.
-	 * @throws MWException
 	 */
 	protected function getHistoryPageAction(): IMenuEntry {
 		$entry = new SingleMenuEntry(
@@ -305,7 +299,6 @@ class ToolbarBuilder {
 	 * FIXME: temporary duplicated code, same as SkinMinerva::getHistoryUrl()
 	 * @param Title $title The Title object of the page being viewed
 	 * @return string
-	 * @throws MWException
 	 */
 	protected function getHistoryUrl( Title $title ) {
 		return ExtensionRegistry::getInstance()->isLoaded( 'MobileFrontend' ) &&
@@ -318,7 +311,6 @@ class ToolbarBuilder {
 	 * Prepares a url to the Special:UserLogin with query parameters
 	 * @param array $query
 	 * @return string
-	 * @throws MWException
 	 */
 	private function getLoginUrl( $query ) {
 		return SpecialPage::getTitleFor( 'Userlogin' )->getLocalURL( $query );
diff --git a/includes/Menu/PageActions/UserNamespaceOverflowBuilder.php b/includes/Menu/PageActions/UserNamespaceOverflowBuilder.php
index 4e1f78220..93a147b7f 100644
--- a/includes/Menu/PageActions/UserNamespaceOverflowBuilder.php
+++ b/includes/Menu/PageActions/UserNamespaceOverflowBuilder.php
@@ -25,7 +25,6 @@ use MediaWiki\Minerva\Menu\Entries\LanguageSelectorEntry;
 use MediaWiki\Minerva\Menu\Group;
 use MediaWiki\Minerva\Permissions\IMinervaPagePermissions;
 use MessageLocalizer;
-use MWException;
 use Title;
 
 class UserNamespaceOverflowBuilder extends DefaultOverflowBuilder {
@@ -60,7 +59,6 @@ class UserNamespaceOverflowBuilder extends DefaultOverflowBuilder {
 
 	/**
 	 * @inheritDoc
-	 * @throws MWException
 	 */
 	public function getGroup( array $toolbox, array $actions ): Group {
 		$group = parent::getGroup( $toolbox, $actions );
diff --git a/includes/Skins/SkinMinerva.php b/includes/Skins/SkinMinerva.php
index f1fc1a4cf..156d7bac1 100644
--- a/includes/Skins/SkinMinerva.php
+++ b/includes/Skins/SkinMinerva.php
@@ -32,7 +32,6 @@ use MediaWiki\Minerva\Menu\User\UserMenuDirector;
 use MediaWiki\Minerva\MinervaUI;
 use MediaWiki\Minerva\Permissions\IMinervaPagePermissions;
 use MediaWiki\Minerva\SkinOptions;
-use MWException;
 use MWTimestamp;
 use RuntimeException;
 use SkinMustache;
@@ -121,7 +120,6 @@ class SkinMinerva extends SkinMustache {
 	 *
 	 * @param array $nav result of SkinTemplate::buildContentNavigationUrls
 	 * @return array|null
-	 * @throws MWException
 	 */
 	private function getPageActions( array $nav ) {
 		if ( $this->isFallbackEditor() || !$this->hasPageActions() ) {