diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp
index 434567e10d..7e7dac30f2 100644
--- a/stepmania/src/Model.cpp
+++ b/stepmania/src/Model.cpp
@@ -90,7 +90,7 @@ void Model::LoadMilkshapeAscii( CString sPath )
 	LoadPieces( sPath, sPath, sPath );
 }
 
-void Model::LoadPieces( CString sMeshesPath, CString sMaterialsPath, CString sBomesPath )
+void Model::LoadPieces( CString sMeshesPath, CString sMaterialsPath, CString sBonesPath )
 {
 	Clear();
 
@@ -99,16 +99,16 @@ void Model::LoadPieces( CString sMeshesPath, CString sMaterialsPath, CString sBo
 
 	LoadMaterialsFromMilkshapeAscii( sMaterialsPath );
 
-	LoadMilkshapeAsciiBones( DEFAULT_ANIMATION_NAME, sBomesPath );
+	LoadMilkshapeAsciiBones( DEFAULT_ANIMATION_NAME, sBonesPath );
 
 	//
     // Setup temp vertices (if necessary)
 	//
 	bool bHasAnyPerVertexBones = false;
-	for (int i = 0; i < (int)m_pGeometry->m_Meshes.size(); i++)
+	for( unsigned i = 0; i < m_pGeometry->m_Meshes.size(); ++i )
 	{
-		msMesh& mesh = m_pGeometry->m_Meshes[i];
-		for (int j = 0; j < (int)mesh.Vertices.size(); j++)
+		const msMesh& mesh = m_pGeometry->m_Meshes[i];
+		for( unsigned j = 0; j < mesh.Vertices.size(); ++j )
 		{
 			if( mesh.Vertices[j].bone != -1 )
 			{
diff --git a/stepmania/src/Model.h b/stepmania/src/Model.h
index c00b0b2428..7040e3caa3 100644
--- a/stepmania/src/Model.h
+++ b/stepmania/src/Model.h
@@ -48,8 +48,6 @@ public:
 
 	virtual void HandleCommand( const ParsedCommand &command );
 
-//	int m_iRefCount;
-
 private:
     RageModelGeometry	*m_pGeometry;
 
diff --git a/stepmania/src/ModelTypes.h b/stepmania/src/ModelTypes.h
index eff2c7b44d..e55388f4cd 100644
--- a/stepmania/src/ModelTypes.h
+++ b/stepmania/src/ModelTypes.h
@@ -56,8 +56,6 @@ typedef struct msMesh
 
 	vector<RageModelVertex>   Vertices;
 
-//  vector<msVec3>     Normals;	// each vertex holds its own normal
-
 	// OPTIMIZATION: If all verts in a mesh are transformed by the same bone, 
 	// then send the transform to the graphics card for the whole mesh instead
 	// of transforming each vertex on the CPU;