diff --git a/src/d_main.cpp b/src/d_main.cpp
index f2ab56e673..c405091fe8 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -3510,7 +3510,6 @@ static int D_InitGame(const FIWADInfo* iwad_info, TArray<FString>& allwads, TArr
 
 static int D_DoomMain_Internal (void)
 {
-	const char *v;
 	const char *wad;
 	FIWadManager *iwad_man;
 
diff --git a/src/playsim/actor.h b/src/playsim/actor.h
index 3a7564039a..3bf44994d1 100644
--- a/src/playsim/actor.h
+++ b/src/playsim/actor.h
@@ -47,8 +47,7 @@
 #include "g_level.h"
 #include "tflags.h"
 #include "portal.h"
-#include "matrix.h"
-#include "TRS.h"
+#include "bonecomponents.h"
 
 struct subsector_t;
 struct FBlockNode;
@@ -691,16 +690,6 @@ public:
 	virtual void Serialize(FSerializer& arc) override;
 };
 
-class DBoneComponents : public DObject
-{
-	DECLARE_CLASS(DBoneComponents, DObject);
-public:
-	TArray<TArray<TRS>>			trscomponents;
-	TArray<TArray<VSMatrix>>	trsmatrix;
-
-	DBoneComponents() = default;
-};
-
 class DViewPosition : public DObject
 {
 	DECLARE_CLASS(DViewPosition, DObject);
diff --git a/src/playsim/p_mobj.cpp b/src/playsim/p_mobj.cpp
index 199a29285e..588acf1abc 100644
--- a/src/playsim/p_mobj.cpp
+++ b/src/playsim/p_mobj.cpp
@@ -159,7 +159,6 @@ CVAR (Int, cl_bloodtype, 0, CVAR_ARCHIVE);
 // CODE --------------------------------------------------------------------
 
 IMPLEMENT_CLASS(DActorModelData, false, false);
-IMPLEMENT_CLASS(DBoneComponents, false, false);
 IMPLEMENT_CLASS(AActor, false, true)
 
 IMPLEMENT_POINTERS_START(AActor)
diff --git a/src/r_data/models.cpp b/src/r_data/models.cpp
index ad5d6475f9..dcb89f398a 100644
--- a/src/r_data/models.cpp
+++ b/src/r_data/models.cpp
@@ -372,7 +372,7 @@ void RenderFrameModels(FModelRenderer *renderer, FLevelLocals *Level, const FSpr
 
 				if (!(smf->flags & MDL_MODELSAREATTACHMENTS) || evaluatedSingle == false)
 				{
-					boneData = animation->CalculateBones(modelframe, nextFrame ? modelframenext : modelframe, nextFrame ? inter : 0.f, *animationData, actor, i);
+					boneData = animation->CalculateBones(modelframe, nextFrame ? modelframenext : modelframe, nextFrame ? inter : 0.f, *animationData, actor->boneComponentData, i);
 					boneStartingPosition = renderer->SetupFrame(animation, 0, 0, 0, boneData, -1);
 					evaluatedSingle = true;
 				}
@@ -381,7 +381,7 @@ void RenderFrameModels(FModelRenderer *renderer, FLevelLocals *Level, const FSpr
 			{
 				if (!(smf->flags & MDL_MODELSAREATTACHMENTS) || evaluatedSingle == false)
 				{
-					boneData = mdl->CalculateBones(modelframe, nextFrame ? modelframenext : modelframe, nextFrame ? inter : 0.f, *animationData, actor, i);
+					boneData = mdl->CalculateBones(modelframe, nextFrame ? modelframenext : modelframe, nextFrame ? inter : 0.f, *animationData, actor->boneComponentData, i);
 					boneStartingPosition = renderer->SetupFrame(mdl, 0, 0, 0, boneData, -1);
 					evaluatedSingle = true;
 				}