diff -r 2872ae438bf7 -r e538444823de harvester/server/inc/harvesterao.h
--- a/harvester/server/inc/harvesterao.h	Wed Sep 15 12:40:59 2010 +0300
+++ b/harvester/server/inc/harvesterao.h	Wed Oct 13 15:02:02 2010 +0300
@@ -22,8 +22,6 @@
 #include <e32base.h>
 #include <badesca.h>
 
-#include <rlocationobjectmanipulator.h>
-
 #include "contextengine.h"
 #include "mdeharvestersession.h"
 
@@ -76,8 +74,7 @@
 		void ConstructL(CMdEObjectDef& aObjectDef);
 
 	public:	
-        static CHarvesterAoPropertyDefs* NewL();
-        void SetByObjectDefL( CMdEObjectDef& aObjectDef );
+		static CHarvesterAoPropertyDefs* NewL(CMdEObjectDef& aObjectDef);
 	};
 
 /**
@@ -558,6 +555,8 @@
         
         CHarvesterAoPropertyDefs* iPropDefs;
         
+        TBool iMassMemoryIdChecked;
+        
         // Own.
         CDesCArray* iCameraExtensionArray;
 
@@ -586,11 +585,7 @@
         HBufC* iMmcSoundsPath;
         
         TBool iUnmountDetected;
-        TBool iUnmountHandlingOngoing;
         TBool iPriorityInterruptDetected;
-        
-        RLocationObjectManipulator iLocManipulator;
-        TBool iLocManipulatorConnected;
 	};
 	
 #endif //__CHARVESTERAO_H__