diff --git a/app/Http/Controllers/Admin/Nodes/NodeViewController.php b/app/Http/Controllers/Admin/Nodes/NodeViewController.php
index 8d42e278a..9c396a63f 100644
--- a/app/Http/Controllers/Admin/Nodes/NodeViewController.php
+++ b/app/Http/Controllers/Admin/Nodes/NodeViewController.php
@@ -91,7 +91,7 @@ class NodeViewController extends Controller
 
         return $this->view->make('admin.nodes.view.servers', [
             'node' => $node,
-            'servers' => $node->servers()->with(['user', 'nest', 'egg'])->paginate(25),
+            'servers' => $node->servers()->with(['user', 'egg'])->paginate(25),
         ]);
     }
 }
diff --git a/app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php b/app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php
index 1b5a3eae5..45de53c40 100644
--- a/app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php
+++ b/app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php
@@ -28,7 +28,7 @@ class ServerInstallController extends Controller
      */
     public function index(Request $request, string $uuid): JsonResponse
     {
-        $server = $this->repository->getByUuid($uuid);
+        $server = Server::findOrFailByUuid($uuid);
         $egg = $server->egg;
 
         return new JsonResponse([
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 908ac02bc..0544d351d 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -363,7 +363,7 @@ class Server extends Model
     public static function findOrFailByUuid(string $uuid): Server
     {
         /** @var Server $server */
-        $server = Server::with(['nest', 'node'])
+        $server = Server::with(['node'])
             ->where('uuidShort', $uuid)
             ->orWhere('uuid', $uuid)
             ->firstOrFail();
diff --git a/app/Services/Subusers/SubuserCreationService.php b/app/Services/Subusers/SubuserCreationService.php
index 4c7b46e52..a55c4e1e6 100644
--- a/app/Services/Subusers/SubuserCreationService.php
+++ b/app/Services/Subusers/SubuserCreationService.php
@@ -9,7 +9,6 @@ use App\Models\Subuser;
 use Illuminate\Database\ConnectionInterface;
 use App\Services\Users\UserCreationService;
 use App\Repositories\Eloquent\SubuserRepository;
-use App\Exceptions\Repository\RecordNotFoundException;
 use App\Exceptions\Service\Subuser\UserIsServerOwnerException;
 use App\Exceptions\Service\Subuser\ServerSubuserExistsException;
 
@@ -22,7 +21,6 @@ class SubuserCreationService
         private ConnectionInterface $connection,
         private SubuserRepository $subuserRepository,
         private UserCreationService $userCreationService,
-        private UserRepositoryInterface $userRepository
     ) {
     }