--- a/fontservices/fontstore/src/FNTBODY.CPP	Tue Aug 31 17:01:26 2010 +0300
+++ b/fontservices/fontstore/src/FNTBODY.CPP	Wed Sep 01 12:39:40 2010 +0100
@@ -21,12 +21,6 @@
 #include "FNTBODY.H"
 #include <graphics/openfontconstants.h>
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "FNTBODYTraces.h"
-#endif
-
-
 CFontStoreFile::CFontStoreFile()
  :	iCollectionUid(KNullUid),
 	iUsageCount(1),
@@ -278,11 +272,7 @@
 
 const TBitmapFontCharacterMetrics* TCharacterMetricsTable::Metric(TInt aIndex) const
 	{
-	if ((aIndex < 0) || (aIndex > iNumberOfMetrics))
-	    {
-	    OstTraceExt2( TRACE_FATAL, TCHARACTERMETRICSTABLE_METRIC, "TCharacterMetricsTable::Metric, aIndex=%d, iNumberOfMetrics=%d, Panic(EFntMetricsIndexOutOfBounds)", aIndex, iNumberOfMetrics);
-	    __ASSERT_DEBUG(0, Panic(EFntMetricsIndexOutOfBounds));
-	    }
+	__ASSERT_DEBUG((aIndex >= 0) && (aIndex <= iNumberOfMetrics), Panic(EFntMetricsIndexOutOfBounds));
     // Sometimes the start ptr is to a metrics heap item and sometimes it points into a ROM file
     if (iMetricsOnHeap)
         {