diff --git a/Engine/Source/Editor/UILayers/AssetBrowser.cpp b/Engine/Source/Editor/UILayers/AssetBrowser.cpp
index a688af0a..fd24e926 100644
--- a/Engine/Source/Editor/UILayers/AssetBrowser.cpp
+++ b/Engine/Source/Editor/UILayers/AssetBrowser.cpp
@@ -976,10 +976,7 @@ void AssetBrowser::ImportModelFile(const char* pFilePath)
 		genericProducer.EnableOption(cdtools::GenericProducerOptions::CleanUnusedObjects);
 		genericProducer.EnableOption(cdtools::GenericProducerOptions::GenerateTangentSpace);
 		genericProducer.EnableOption(cdtools::GenericProducerOptions::TriangulateModel);
-		if (!m_importOptions.ImportAnimation)
-		{
-			genericProducer.EnableOption(cdtools::GenericProducerOptions::FlattenTransformHierarchy);
-		}
+		genericProducer.EnableOption(cdtools::GenericProducerOptions::FlattenTransformHierarchy);
 
 		cdtools::Processor processor(&genericProducer, nullptr, newSceneDatabase.get());
 		processor.EnableOption(cdtools::ProcessorOptions::Dump);
diff --git a/Engine/Source/Runtime/Rendering/Resources/SkeletonResource.cpp b/Engine/Source/Runtime/Rendering/Resources/SkeletonResource.cpp
index 7e511754..ea67def7 100644
--- a/Engine/Source/Runtime/Rendering/Resources/SkeletonResource.cpp
+++ b/Engine/Source/Runtime/Rendering/Resources/SkeletonResource.cpp
@@ -185,9 +185,9 @@ void SkeletonResource::ClearSkeletonData()
 
 void SkeletonResource::FreeSkeletonData()
 {
-	//ClearSkeletonData();
-	//VertexBuffer().swap(m_vertexBuffer);
-	//IndexBuffer().swap(m_indexBuffer);
+	ClearSkeletonData();
+	VertexBuffer().swap(m_vertexBuffer);
+	IndexBuffer().swap(m_indexBuffer);
 }
 
 void SkeletonResource::DestroyVertexBufferHandle()