diff -r a3a1ae9acec6 -r da5135c61bad meetingrequest/mrcommon/inc/esmrconfig.hrh
--- a/meetingrequest/mrcommon/inc/esmrconfig.hrh	Mon Mar 15 12:39:10 2010 +0200
+++ b/meetingrequest/mrcommon/inc/esmrconfig.hrh	Wed Mar 31 21:08:33 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -18,18 +18,13 @@
 #ifndef ESMRCONFIG_HRH
 #define ESMRCONFIG_HRH
 
-#ifndef KFeatureIdPrintingFrameworkCalendarPlugin
-#define KFeatureIdPrintingFrameworkCalendarPlugin 5057 //actual ID from customswruntimeids.hrh
-#endif // KFeatureIdPrintingFrameworkCalendarPlugin
-
-#ifndef KFeatureIdFfFsCalendarLocation
-#define KFeatureIdFfFsCalendarLocation 5171 //actual ID from customswruntimeids.hrh
-#endif // KFeatureIdFfFsCalendarLocation
-
 // #define EMAIL_FW_NEW_CAPAS_RELEASED
 
 // #define ESMR_ENABLE_PROFILE
 
+#undef RD_USE_MYLOCATIONUI
+#undef RD_USE_PS2_APIS
+
 #endif //ESMRCONFIG_HRH
 
 // EOF