diff -r 834e27cad510 -r 16118e24b93b landmarks/locationlandmarks/tsrc/LandmarkTestModule/src/FT_CPosTp154.cpp
--- a/landmarks/locationlandmarks/tsrc/LandmarkTestModule/src/FT_CPosTp154.cpp	Tue Jul 06 14:44:11 2010 +0300
+++ b/landmarks/locationlandmarks/tsrc/LandmarkTestModule/src/FT_CPosTp154.cpp	Wed Aug 18 10:11:45 2010 +0300
@@ -2,9 +2,9 @@
 * Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
@@ -64,8 +64,6 @@
     iLandmarks.ResetAndDestroy();
     iLandmarks.Close();
 
-    delete iDatabase;
-    iDatabase=NULL;
 
     delete iLandmarkEncoder;
     iLandmarkEncoder = NULL;
@@ -76,17 +74,6 @@
     delete iOperation;
     iOperation = NULL;
 
-    TRAPD(err, RemoveGlobalCategoriesL());
-    if (err != KErrNone && err != KErrNotFound)
-        {
-        HBufC* buf = HBufC::NewLC( 128 );
-        TPtr buffer = buf->Des();
-            
-        buffer.Format(_L("RemoveGlobalCategoriesL leaved with %d"), err);
-        iLog->Log( buffer );
-        
-        CleanupStack::PopAndDestroy( buf );
-        }
 
     iLog->Log(_L("CloseTest Done"));
     }
@@ -101,32 +88,10 @@
     {
     BaflUtils::EnsurePathExistsL( iFileSession, KKMZFile );
 
-    // Use same lm db as in composite search test
-    iDatabase = UseCompositeLandmarksDbFileL();
-    if (iDatabase->IsInitializingNeeded())
-       {
-       ExecuteAndDeleteLD(iDatabase->InitializeL());
-       }
 
     // Delete the trace file
     DeleteFileL(KFileTrace);
 
-    delete iDatabase;
-    iDatabase = NULL;
-
-    iDatabase = CPosLandmarkDatabase::OpenL();
-    	
-    	if (iDatabase->IsInitializingNeeded())
-       {
-       ExecuteAndDeleteLD(iDatabase->InitializeL());
-       }
-
-    // Do reset so that global categories are included
-    CPosLmCategoryManager* categoryManager = CPosLmCategoryManager::NewL(*iDatabase);
-    CleanupStack::PushL(categoryManager);
-
-    ExecuteAndDeleteLD(categoryManager->ResetGlobalCategoriesL());
-    CleanupStack::PopAndDestroy(categoryManager);
 
     HBufC8* emptyBuffer=NULL;