diff --git a/Code/client/Games/Skyrim/Actor.cpp b/Code/client/Games/Skyrim/Actor.cpp
index 4c34a8a01..6033cfdb4 100644
--- a/Code/client/Games/Skyrim/Actor.cpp
+++ b/Code/client/Games/Skyrim/Actor.cpp
@@ -680,15 +680,6 @@ bool TP_MAKE_THISCALL(HookInitiateMountPackage, Actor, Actor* apMount)
         return ThisCall(RealInitiateMountPackage, apThis, apMount);
     }
 
-    // TODO: dont cancel, request ownership
-    /*
-    if (ActorExtension* pMountExt = apMount->GetExtension())
-    {
-        if (pMountExt->IsRemote())
-            return false;
-    }
-    */
-
     World::Get().GetRunner().Trigger(MountEvent(apThis->formID, apMount->formID));
     return ThisCall(RealInitiateMountPackage, apThis, apMount);
 }
diff --git a/Code/client/Services/Generic/CharacterService.cpp b/Code/client/Services/Generic/CharacterService.cpp
index 0a2d99de0..7097ad282 100644
--- a/Code/client/Services/Generic/CharacterService.cpp
+++ b/Code/client/Services/Generic/CharacterService.cpp
@@ -1148,6 +1148,7 @@ void CharacterService::OnNotifyProjectileLaunch(const NotifyProjectileLaunch& ac
 
 void CharacterService::OnMountEvent(const MountEvent& acEvent) const noexcept
 {
+#if TP_SKYRIM64
     auto view = m_world.view<FormIdComponent>();
 
     const auto riderIt = std::find_if(std::begin(view), std::end(view), [id = acEvent.RiderID, view](auto entity) {
@@ -1204,10 +1205,12 @@ void CharacterService::OnMountEvent(const MountEvent& acEvent) const noexcept
     request.RiderId = riderServerIdRes.value();
 
     m_transport.Send(request);
+#endif
 }
 
 void CharacterService::OnNotifyMount(const NotifyMount& acMessage) const noexcept
 {
+#if TP_SKYRIM64
     auto remoteView = m_world.view<RemoteComponent, FormIdComponent>();
 
     const auto riderIt = std::find_if(std::begin(remoteView), std::end(remoteView), [remoteView, Id = acMessage.RiderId](auto entity)
@@ -1258,7 +1261,6 @@ void CharacterService::OnNotifyMount(const NotifyMount& acMessage) const noexcep
     }
 
     pRider->InitiateMountPackage(pMount);
-
-    spdlog::info("Rider mounted actor.");
+#endif
 }
 
diff --git a/Code/client/Services/Generic/TestService.cpp b/Code/client/Services/Generic/TestService.cpp
index 6537fada1..03771c7ff 100644
--- a/Code/client/Services/Generic/TestService.cpp
+++ b/Code/client/Services/Generic/TestService.cpp
@@ -168,28 +168,7 @@ void TestService::OnUpdate(const UpdateEvent& acUpdateEvent) noexcept
         {
             s_f8Pressed = true;
 
-            Actor* pActor = (Actor*)TESForm::GetById(0xFF0015AD);
-            PlayerCharacter::Get()->InitiateMountPackage(pActor);
-
-            /*
-            auto* pActor = (Actor*)TESForm::GetById(0xFF000DA5);
-            pActor->SetWeaponDrawnEx(true);
-
-            //PlaceActorInWorld();
-
-            const auto pPlayerBaseForm = static_cast<TESNPC*>(PlayerCharacter::Get()->baseForm);
-
-            //const auto pNpc = TESNPC::Create(data, pPlayerBaseForm->GetChangeFlags());
-            auto pActor = Actor::Create(pPlayerBaseForm);
-            pActor->SaveInventory(0);
-
-        #if TP_SKYRIM64
-            auto& objManager = DefaultObjectManager::Get();
-            spdlog::info(objManager.isSomeActionReady);
-        #endif
-
-            TP_ASSERT(0, "{}", 5)
-            */
+            PlaceActorInWorld();
         }
     }
     else