--- a/src/hbservers/hbdevicedialogappserver/main.cpp	Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbservers/hbdevicedialogappserver/main.cpp	Wed Aug 18 10:05:37 2010 +0300
@@ -100,7 +100,6 @@
 }
 #endif // Q_OS_SYMBIAN
 
-#define USE_LOCKER 1
 int main(int arg, char *args[])
 {
     INSTALL_MESSAGE_HANDLER
@@ -163,16 +162,17 @@
     mainWindow.addView(view);
 
 #if defined (Q_OS_SYMBIAN)
+    _LIT(KCaption, "HbDeviceDialogAppServer");
     CEikonEnv* env = CEikonEnv::Static();
 
     if (env) {
         CApaWindowGroupName* wgName = CApaWindowGroupName::NewLC(env->WsSession());
         wgName->SetHidden(ETrue); // hides us from FSW and protects us from OOM FW etc.
         wgName->SetSystem(ETrue); // Allow only application with PowerManagement cap to shut us down
-        wgName->SetCaptionL(_L("HbDeviceDialogAppServer"));
+        wgName->SetCaptionL(KCaption);
         wgName->SetAppUid(KNullUid);
         wgName->SetWindowGroupName(env->RootWin());
-        CleanupStack::PopAndDestroy();       
+        CleanupStack::PopAndDestroy(wgName);
     }
 #endif // Q_OS_SYMBIAN