diff --git a/lib/Model/Mount.php b/lib/Model/Mount.php
index db949ffb9..c570d68ad 100644
--- a/lib/Model/Mount.php
+++ b/lib/Model/Mount.php
@@ -42,7 +42,6 @@ class Mount extends ManagedModel implements IDeserializable, IQueryRow, JsonSeri
 	private string $storage;
 	private ICloudIdManager $cloudIdManager;
 	private IClientService $httpClientService;
-	private CircleMountManager $mountManager;
 	private string $remote = '';
 	private int $remoteShareId = 0;
 
@@ -306,25 +305,6 @@ public function getHttpClientService(): IClientService {
 		return $this->httpClientService;
 	}
 
-
-	/**
-	 * @param CircleMountManager $mountManager
-	 *
-	 * @return Mount
-	 */
-	public function setMountManager(CircleMountManager $mountManager): self {
-		$this->mountManager = $mountManager;
-
-		return $this;
-	}
-
-	/**
-	 * @return CircleMountManager
-	 */
-	public function getMountManager(): CircleMountManager {
-		return $this->mountManager;
-	}
-
 	public function setRemote(string $remote): void {
 		$this->remote = $remote;
 	}
@@ -353,9 +333,7 @@ public function toMount(): array {
 			'token' => $this->getToken(),
 			'password' => $this->getPassword(),
 			'mountpoint' => $this->getMountPoint(false),
-			//			'manager'           => $this->getMountManager(),
 			'HttpClientService' => $this->getHttpClientService(),
-			'manager' => $this->getMountManager(),
 			'cloudId' => $this->getCloudIdManager()->getCloudId(
 				$member->getUserId(),
 				$member->getRemoteInstance()->getRoot()
diff --git a/lib/MountManager/CircleMount.php b/lib/MountManager/CircleMount.php
index 21d3ba6bf..14601e18b 100644
--- a/lib/MountManager/CircleMount.php
+++ b/lib/MountManager/CircleMount.php
@@ -14,40 +14,33 @@
 use Exception;
 use JsonSerializable;
 use OC\Files\Mount\MountPoint;
-use OC\Files\Mount\MoveableMount;
 use OCA\Circles\Exceptions\MountPointConstructionException;
 use OCA\Circles\Model\Mount;
 use OCA\Circles\Tools\Traits\TArrayTools;
+use OCP\Files\Mount\IMovableMount;
+use OCP\Files\Storage\IStorage;
 use OCP\Files\Storage\IStorageFactory;
+use Override;
 
 /**
  * Class CircleMount
  *
  * @package OCA\Circles\MountManager
  */
-class CircleMount extends MountPoint implements MoveableMount, JsonSerializable {
+class CircleMount extends MountPoint implements JsonSerializable {
 	use TArrayTools;
 
-
-	/** @var Mount */
-	private $mount;
-
-	/** @var string */
-	private $storageClass;
-
+	/** @var class-string<IStorage> */
+	private string $storageClass;
 
 	/**
-	 * CircleMount constructor.
-	 *
-	 * @param Mount $mount
-	 * @param string $storage
-	 * @param IStorageFactory|null $loader
+	 * @param IStorage|class-string<IStorage> $storage
 	 *
 	 * @throws MountPointConstructionException
 	 */
 	public function __construct(
-		Mount $mount,
-		string $storage,
+		private Mount $mount,
+		IStorage|string $storage,
 		?IStorageFactory $loader = null,
 	) {
 		try {
@@ -57,54 +50,18 @@ public function __construct(
 				$mount->toMount(),
 				$loader
 			);
-		} catch (Exception $e) {
+		} catch (Exception) {
 			throw new MountPointConstructionException();
 		}
 
-		$this->mount = $mount;
-		$this->storageClass = $storage;
-	}
-
-
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 *
-	 * @return bool
-	 */
-	public function moveMount($target) {
-		$result = $this->mount->getMountManager()->renameShare($this->gsShareId, $target);
-		$this->setMountPoint($target);
-
-		return $result;
+		$this->storageClass = $storage instanceof IStorage ? get_class($storage) : $storage;
 	}
 
-	/**
-	 * Remove the mount points
-	 *
-	 * @return mixed
-	 * @return bool
-	 */
-	public function removeMount() {
-		return $this->mount->getMountManager()->unshare($this->gsShareId);
-	}
-
-
-	/**
-	 * Get the type of mount point, used to distinguish things like shares and external storages
-	 * in the web interface
-	 *
-	 * @return string
-	 */
-	public function getMountType() {
+	#[Override]
+	public function getMountType(): string {
 		return 'shared';
 	}
 
-	public function getInitiator() {
-	}
-
-
 	/**
 	 * @return array
 	 */
diff --git a/lib/MountManager/CircleMountManager.php b/lib/MountManager/CircleMountManager.php
deleted file mode 100644
index 6990e8c86..000000000
--- a/lib/MountManager/CircleMountManager.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-
-/**
- * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-
-namespace OCA\Circles\MountManager;
-
-use OCA\Circles\Db\GSSharesRequest;
-use OCA\Circles\Model\GlobalScale\GSShareMountpoint;
-use OCA\Files_Sharing\External\Manager;
-use OCP\Share\Exceptions\ShareNotFound;
-
-/**
- * Class CircleMountManager
- * @deprecated
- * @package OCA\Circles\MountManager
- */
-class CircleMountManager extends Manager {
-	/** @var string */
-	private $userId;
-
-	/** @var GSSharesRequest */
-	private $gsSharesRequest;
-
-
-	/**
-	 * MountManager constructor.
-	 *
-	 * @param string $userId
-	 * @param GSSharesRequest $gsSharesRequest
-	 *
-	 * @noinspection PhpMissingParentConstructorInspection
-	 */
-	public function __construct($userId, GSSharesRequest $gsSharesRequest) {
-		$this->userId = $userId;
-		$this->gsSharesRequest = $gsSharesRequest;
-	}
-
-
-	/**
-	 * @param int $gsShareId
-	 * @param string $target
-	 *
-	 * @return bool
-	 */
-	public function renameShare(int $gsShareId, string $target) {
-		try {
-			if ($target !== '-') {
-				$target = $this->stripPath($target);
-				$this->gsSharesRequest->getShareMountPointByPath($this->userId, $target);
-
-				return false;
-			}
-		} catch (ShareNotFound $e) {
-		}
-
-		$mountPoint = new GSShareMountpoint($gsShareId, $this->userId, $target);
-		try {
-			$this->gsSharesRequest->getShareMountPointById($gsShareId, $this->userId);
-			$this->gsSharesRequest->updateShareMountPoint($mountPoint);
-		} catch (ShareNotFound $e) {
-			$this->gsSharesRequest->generateShareMountPoint($mountPoint);
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param int $gsShareId
-	 *
-	 * @return bool
-	 */
-	public function unshare(int $gsShareId) {
-		return $this->renameShare($gsShareId, '-');
-	}
-
-
-	/**
-	 * remove '/user/files' from the path and trailing slashes
-	 *
-	 * @param string $path
-	 *
-	 * @return string
-	 */
-	protected function stripPath(string $path): string {
-		$prefix = '/' . $this->userId . '/files';
-
-		return rtrim(substr($path, strlen($prefix)), '/');
-	}
-}
diff --git a/lib/MountManager/CircleMountProvider.php b/lib/MountManager/CircleMountProvider.php
index 58c9ab27e..3e4fdd782 100644
--- a/lib/MountManager/CircleMountProvider.php
+++ b/lib/MountManager/CircleMountProvider.php
@@ -41,12 +41,12 @@
 class CircleMountProvider implements IMountProvider {
 	use TArrayTools;
 
+	/** @var class-string<ExternalStorage> */
 	public const EXTERNAL_STORAGE = ExternalStorage::class;
 
 	public function __construct(
 		private IClientService $clientService,
 		private IRootFolder $rootFolder,
-		private CircleMountManager $circleMountManager,
 		private ICloudIdManager $cloudIdManager,
 		private MountRequest $mountRequest,
 		private MountPointRequest $mountPointRequest,
@@ -57,9 +57,6 @@ public function __construct(
 	}
 
 	/**
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 *
 	 * @return list<IMountPoint>
 	 * @throws RequestBuilderException
 	 * @throws FederatedUserException
@@ -86,10 +83,6 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader): array {
 
 
 	/**
-	 * @param Mount $mount
-	 * @param IStorageFactory $storageFactory
-	 *
-	 * @return CircleMount
 	 * @throws InitiatorNotFoundException
 	 * @throws MountPointConstructionException
 	 */
@@ -103,9 +96,7 @@ public function generateCircleMount(Mount $mount, IStorageFactory $storageFactor
 		}
 
 		$mount->setCloudIdManager($this->cloudIdManager)
-			->setHttpClientService($this->clientService)
-//		->setStorage(self::EXTERNAL_STORAGE)
-			->setMountManager($this->circleMountManager);
+			->setHttpClientService($this->clientService);
 
 		return new CircleMount(
 			$mount,
@@ -114,75 +105,6 @@ public function generateCircleMount(Mount $mount, IStorageFactory $storageFactor
 		);
 	}
 
-
-	/**
-	 * @param int $gsShareId
-	 * @param string $target
-	 *
-	 * @return bool
-	 */
-	public function renameShare(int $gsShareId, string $target) {
-		//		try {
-		//			if ($target !== '-') {
-		//				$target = $this->stripPath($target);
-		//				$this->gsSharesRequest->getShareMountPointByPath($this->userId, $target);
-		//
-		//				return false;
-		//			}
-		//		} catch (ShareNotFound $e) {
-		//		}
-		//
-		//		$mountPoint = new GSShareMountpoint($gsShareId, $this->userId, $target);
-		//		try {
-		//			$this->gsSharesRequest->getShareMountPointById($gsShareId, $this->userId);
-		//			$this->gsSharesRequest->updateShareMountPoint($mountPoint);
-		//		} catch (ShareNotFound $e) {
-		//			$this->gsSharesRequest->generateShareMountPoint($mountPoint);
-		//		}
-
-		return true;
-	}
-
-
-	// TODO: implement !
-	public function getMountManager() {
-		return $this;
-	}
-
-	// TODO: implement !
-	public function removeShare($mountPoint) {
-	}
-
-	// TODO: implement !
-	public function removeMount($mountPoint) {
-	}
-
-
-	/**
-	 * @param int $gsShareId
-	 *
-	 * @return bool
-	 */
-	public function unshare(int $gsShareId) {
-		return $this->renameShare($gsShareId, '-');
-	}
-
-
-	/**
-	 * remove '/user/files' from the path and trailing slashes
-	 *
-	 * @param string $path
-	 *
-	 * @return string
-	 */
-	protected function stripPath($path) {
-		return $path;
-		//		$prefix = '/' . $this->userId . '/files';
-		//
-		//		return rtrim(substr($path, strlen($prefix)), '/');
-	}
-
-
 	private function fixDuplicateFile(string $userId, Mount $mount): void {
 		if ($mount->getOriginalMountPoint() === '-') {
 			return;
diff --git a/psalm.xml b/psalm.xml
index 9f4e727cf..3daa9b533 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -62,7 +62,6 @@
 		<file name="tests/stubs/oca_dav_carddav_contactsmanager.php" />
 		<file name="tests/stubs/oca_federatedfilesharing_notifications.php" />
 		<file name="tests/stubs/oca_files_sharing_event_usershareaccessupdatedevent.php" />
-		<file name="tests/stubs/oca_files_sharing_external_manager.php" />
 		<file name="tests/stubs/oca_user_ldap_mapping_abstractmapping.php" />
 		<file name="tests/stubs/oca_user_ldap_mapping_usermapping.php" />
 		<file name="tests/stubs/stecman_component_symfony_console_bashcompletion_completion_completionawareinterface.php" />
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index b4064c56a..11e977806 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -248,14 +248,6 @@
       <code><![CDATA[isInstalled]]></code>
     </DeprecatedMethod>
   </file>
-  <file src="lib/Model/Mount.php">
-    <DeprecatedClass>
-      <code><![CDATA[CircleMountManager]]></code>
-      <code><![CDATA[CircleMountManager]]></code>
-      <code><![CDATA[CircleMountManager]]></code>
-      <code><![CDATA[CircleMountManager]]></code>
-    </DeprecatedClass>
-  </file>
   <file src="lib/Model/Probes/BasicProbe.php">
     <InvalidReturnType>
       <code><![CDATA[$this]]></code>
@@ -295,28 +287,6 @@
       <code><![CDATA[null]]></code>
     </NullableReturnStatement>
   </file>
-  <file src="lib/MountManager/CircleMount.php">
-    <UndefinedClass>
-      <code><![CDATA[MoveableMount]]></code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/MountManager/CircleMountManager.php">
-    <DeprecatedClass>
-      <code><![CDATA[GSSharesRequest]]></code>
-      <code><![CDATA[GSSharesRequest]]></code>
-    </DeprecatedClass>
-  </file>
-  <file src="lib/MountManager/CircleMountProvider.php">
-    <DeprecatedClass>
-      <code><![CDATA[private]]></code>
-    </DeprecatedClass>
-    <MissingDependency>
-      <code><![CDATA[CircleMount]]></code>
-    </MissingDependency>
-    <UndefinedClass>
-      <code><![CDATA[ExternalStorage]]></code>
-    </UndefinedClass>
-  </file>
   <file src="lib/Search/LocalUsers.php">
     <DeprecatedMethod>
       <code><![CDATA[search]]></code>
diff --git a/tests/stubs/oca_files_sharing_external_manager.php b/tests/stubs/oca_files_sharing_external_manager.php
deleted file mode 100644
index 8f41c0c5c..000000000
--- a/tests/stubs/oca_files_sharing_external_manager.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-namespace OCA\Files_Sharing\External;
-
-use OC\Files\Filesystem;
-use OC\Files\SetupManager;
-use OC\User\NoUserException;
-use OCA\FederatedFileSharing\Events\FederatedShareAddedEvent;
-use OCA\Files_Sharing\Helper;
-use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\DB\Exception;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Federation\ICloudFederationFactory;
-use OCP\Federation\ICloudFederationProviderManager;
-use OCP\Files\Events\InvalidateMountCacheEvent;
-use OCP\Files\Folder;
-use OCP\Files\IRootFolder;
-use OCP\Files\NotFoundException;
-use OCP\Files\NotPermittedException;
-use OCP\Files\Storage\IStorageFactory;
-use OCP\Http\Client\IClientService;
-use OCP\ICertificateManager;
-use OCP\IDBConnection;
-use OCP\IGroup;
-use OCP\IGroupManager;
-use OCP\IUser;
-use OCP\IUserSession;
-use OCP\Notification\IManager;
-use OCP\OCS\IDiscoveryService;
-use OCP\Share\IShare;
-use Psr\Log\LoggerInterface;
-
-class Manager {
-	public function __construct(private IDBConnection $connection, private \OC\Files\Mount\Manager $mountManager, private IStorageFactory $storageLoader, private IClientService $clientService, private IManager $notificationManager, private IDiscoveryService $discoveryService, private ICloudFederationProviderManager $cloudFederationProviderManager, private ICloudFederationFactory $cloudFederationFactory, private IGroupManager $groupManager, IUserSession $userSession, private IEventDispatcher $eventDispatcher, private LoggerInterface $logger, private IRootFolder $rootFolder, private SetupManager $setupManager, private ICertificateManager $certificateManager, private ExternalShareMapper $externalShareMapper)
- {
- }
-
-	/**
-	 * Add new server-to-server share.
-	 *
-	 * @throws Exception
-	 * @throws NotPermittedException
-	 * @throws NoUserException
-	 */
-	public function addShare(ExternalShare $externalShare, IUser|IGroup|null $shareWith = null): ?Mount
- {
- }
-
-	public function getShare(string $id, ?IUser $user = null): ExternalShare|false
- {
- }
-
-	public function getShareByToken(string $token): ExternalShare|false
- {
- }
-
-	/**
-	 * Accept server-to-server share.
-	 *
-	 * @return bool True if the share could be accepted, false otherwise
-	 */
-	public function acceptShare(ExternalShare $externalShare, ?IUser $user = null): bool
- {
- }
-
-	/**
-	 * Decline server-to-server share
-	 *
-	 * @return bool True if the share could be declined, false otherwise
-	 */
-	public function declineShare(ExternalShare $externalShare, ?Iuser $user = null): bool
- {
- }
-
-	public function processNotification(ExternalShare $remoteShare, ?IUser $user = null): void
- {
- }
-
-	/**
-	 * Try to send accept message to ocm end-point
-	 *
-	 * @param 'accept'|'decline' $feedback
-	 * @return array|false
-	 */
-	protected function tryOCMEndPoint(ExternalShare $externalShare, string $feedback)
- {
- }
-
-	/**
-	 * remove '/user/files' from the path and trailing slashes
-	 */
-	protected function stripPath(string $path): string
- {
- }
-
-	public function getMount(array $data, ?IUser $user = null): Mount
- {
- }
-
-	protected function mountShare(array $data, ?IUser $user = null): Mount
- {
- }
-
-	public function getMountManager(): \OC\Files\Mount\Manager
- {
- }
-
-	public function setMountPoint(string $source, string $target): bool
- {
- }
-
-	public function removeShare(string $mountPoint): bool
- {
- }
-
-	/**
-	 * Remove re-shares from share table and mapping in the federated_reshares table
-	 */
-	protected function removeReShares(string $mountPointId): void
- {
- }
-
-	/**
-	 * Remove all shares for user $uid if the user was deleted.
-	 */
-	public function removeUserShares(IUser $user): bool
- {
- }
-
-	public function removeGroupShares(IGroup $group): bool
- {
- }
-
-	/**
-	 * Return a list of shares which are not yet accepted by the user.
-	 *
-	 * @return list<ExternalShare> list of open server-to-server shares
-	 */
-	public function getOpenShares(): array
- {
- }
-
-	/**
-	 * Return a list of shares which are accepted by the user.
-	 *
-	 * @return list<ExternalShare> list of accepted server-to-server shares
-	 */
-	public function getAcceptedShares(): array
- {
- }
-}