diff --git a/Themes/_fallback/Other/Profile Catalog.xsl b/Themes/_fallback/Other/Profile Catalog.xsl
deleted file mode 100644
index 8ba3b5d540..0000000000
--- a/Themes/_fallback/Other/Profile Catalog.xsl	
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:import href="Common.xsl"/>
-
-
-	<!-- Main Template -->
-
-	<xsl:template match="/Catalog">
-		<xsl:call-template name="MainTemplate">
-			<xsl:with-param name="FullHeader" select="0" />
-			<xsl:with-param name="DocName" select="name()" />
-			<xsl:with-param name="Content">
-				<xsl:apply-templates select="/Catalog/Totals" />
-				<xsl:apply-templates select="/Catalog/Songs" />
-				<xsl:apply-templates select="/Catalog/Courses" />
-			</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>
-	
-	
-	
-	<!-- Totals -->
-	
-	<xsl:template match="/Catalog/Totals">
-		<xsl:call-template name="CollapsibleTopSection">
-			<xsl:with-param name="title">
-				Totals
-			</xsl:with-param>
-			<xsl:with-param name="text">
-
-				<table class="EntityTableAttr">
-					<xsl:call-template name="DataTableGenerator">
-						<xsl:with-param name="cols" select="2" />
-						<xsl:with-param name="nodeset" select="*[text()]" />
-					</xsl:call-template>
-				</table>
-				
-			</xsl:with-param>
-		</xsl:call-template>
-					
-	</xsl:template>		
-
-
-
-	<!-- TopScores for SongScores and CourseScores -->
-	
-	<xsl:template match="/Catalog/Songs | /Catalog/Courses">
-		<xsl:variable name="Type" select="name()" />
-		<xsl:variable name="SubType">
-			<xsl:if test="$Type='Song'">Steps</xsl:if>
-			<xsl:if test="$Type='Course'">Trail</xsl:if>
-		</xsl:variable>
-		<xsl:call-template name="CollapsibleTopSection">
-			<xsl:with-param name="title">
-				<xsl:value-of select="$Type" />
-			</xsl:with-param>
-			<xsl:with-param name="text">
-				<xsl:apply-templates select="Song | Course" />
-			</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>		
-
-	<xsl:template match="Song | Course">
-		<xsl:variable name="Dir" select="@Dir" />
-		<xsl:variable name="Path" select="@Path" />
-		<xsl:variable name="MainTitle" select="/Catalog/*/*[@Dir=$Dir or @Path=$Path]/MainTitle" />
-		<xsl:variable name="SubTitle" select="/Catalog/*/*[@Dir=$Dir or @Path=$Path]/SubTitle" />
-		<xsl:call-template name="CollapsibleSubSection">
-			<xsl:with-param name="title">
-				<xsl:apply-templates select="@Dir | @Path" />
-			</xsl:with-param>
-			<xsl:with-param name="text">
-				<xsl:apply-templates select="Steps | Trail" />
-			</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>		
-	
-	<xsl:template match="Steps | Trail">
-		<xsl:call-template name="SubSectionCompact">
-			<xsl:with-param name="title">
-				<xsl:apply-templates select="." mode="AttributeTitleGenerator" />
-			</xsl:with-param>
-			<xsl:with-param name="text">
-				
-				<table class="EntityTableAttr">
-					<xsl:call-template name="DataTableGenerator">
-						<xsl:with-param name="cols" select="1" />
-						<xsl:with-param name="nodeset" select="*[text()] | ./*/*[text()]" />
-					</xsl:call-template>
-				</table>
-
-			</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>		
-
-	
-	<!-- Main Categories End - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-	<!-- That's it -->
-	
-</xsl:stylesheet>
-
diff --git a/src/Profile.cpp b/src/Profile.cpp
index 762514a2a0..1427e414c6 100644
--- a/src/Profile.cpp
+++ b/src/Profile.cpp
@@ -41,8 +41,6 @@ const RString RIVAL_SUBDIR         = "Rivals/";
 
 ThemeMetric<bool> SHOW_COIN_DATA( "Profile", "ShowCoinData" );
 static Preference<bool> g_bProfileDataCompress( "ProfileDataCompress", false );
-static Preference<bool> g_bCopyCatalogToProfiles( "CopyCatalogToProfiles", true );
-extern Preference<bool> g_bWriteCatalog;
 static ThemeMetric<RString> UNLOCK_AUTH_STRING( "Profile", "UnlockAuthString" );
 #define GUID_SIZE_BYTES 8
 
diff --git a/src/Trail.cpp b/src/Trail.cpp
index be51b71e72..c5c769d32d 100644
--- a/src/Trail.cpp
+++ b/src/Trail.cpp
@@ -109,8 +109,7 @@ const RadarValues &Trail::GetRadarValues() const
 		{
 			const Steps *pSteps = e->pSteps;
 			ASSERT( pSteps );
-			/* Hack: don't calculate for autogen entries; it makes writing Catalog.xml
-			 * take way too long.  (Tournamix 4 Sample.crs takes me ~10s.) */
+			// Hack: don't calculate for autogen entries
 			if( !pSteps->IsAutogen() && e->ContainsTransformOrTurn() )
 			{
 				NoteData nd;