--- a/textinput/ptienginev2/src/PtiLanguageDatabase.cpp	Thu Aug 19 10:15:25 2010 +0300
+++ b/textinput/ptienginev2/src/PtiLanguageDatabase.cpp	Tue Aug 31 15:31:50 2010 +0300
@@ -342,8 +342,6 @@
 	{0, 0}
 	};
 
-const TInt xt9LangImplUidDanish = 0x10282D36;
-const TInt xt9LangImplUidNorwegian = 0x10282D38;
 
 // ---------------------------------------------------------------------------
 // CPtiLanguageDatabase::LanguageCodeForUid
@@ -353,15 +351,6 @@
 EXPORT_C TInt CPtiLanguageDatabase::LanguageCodeForUid(TInt aUid)
 	{
 	TInt i;
-	
-	if ( aUid == xt9LangImplUidDanish )
-	    {
-	    return ELangDanish;
-	    }
-	else if ( aUid == xt9LangImplUidNorwegian )
-	    {
-	    return ELangNorwegian;
-	    }
 
 	for (i = 0; ; i++)
 		{
@@ -386,7 +375,6 @@
 //
 EXPORT_C TInt CPtiLanguageDatabase::CreateMappingTableL(TInt aCoreUid, RArray<TPtiLangDatabaseMapping>& aResult)
 	{
-	CleanupClosePushL( aResult );
 	TInt res = 0, i, lc;
 	TPtiLangDatabaseMapping map;
 	CArrayFix<TInt>* dbs = ListDatabasesLC(aCoreUid);
@@ -414,7 +402,6 @@
 		}
 
 	CleanupStack::PopAndDestroy(); // dbs
-	CleanupStack::Pop( &aResult );
 	return res;
 	}
 
@@ -426,7 +413,6 @@
 //		
 EXPORT_C TInt CPtiLanguageDatabase::CreateMappingTableWithOpaqueL(TInt aCoreUid, RArray<TPtiLangDatabaseMappingOpaque>& aResult)
     {
-	CleanupClosePushL( aResult );
   	TInt res = 0, lc;
 	TPtiLangDatabaseMappingOpaque map;	
 	RImplInfoPtrArray infoArray;
@@ -461,7 +447,7 @@
 		}
 
 	CleanupStack::PopAndDestroy(); // infoArray    
-	CleanupStack::Pop( &aResult );
+
 	return res;
     }