--- a/htiui/HtiServicePlugins/HtiAppServicePlugin/src/HtiAppControl.cpp	Tue Apr 27 16:38:40 2010 +0300
+++ b/htiui/HtiServicePlugins/HtiAppServicePlugin/src/HtiAppControl.cpp	Tue May 11 16:14:15 2010 +0300
@@ -34,14 +34,10 @@
 #include <SWInstApi.h>
 #include <swi/sisregistrysession.h>
 #include <swi/sisregistrypackage.h>
-#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 )
-    #include <javaregistryincludes.h>
-#endif
-#include <WidgetRegistryClient.h>
+#include <javaregistryincludes.h>
+#include <widgetregistryclient.h>
 
-#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 )
-    using namespace Java;
-#endif
+using namespace Java;
 
 // CONSTANTS
 const static TUid KAppServiceUid = { 0x1020DEC7 }; //This is Uid of AppServiceOS
@@ -1638,7 +1634,6 @@
 
     else if ( aMimeIndex > 2 && aMimeIndex < 7 ) // Java
         {
-        #if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 )
             RArray<TUid> uids;
             CleanupClosePushL( uids );
 
@@ -1675,9 +1670,6 @@
             CleanupStack::PopAndDestroy( &uids );
             User::LeaveIfError( uid );
             return uid;
-        #else
-            User::Leave( KErrNotSupported );
-        #endif
         }
 
     else if ( aMimeIndex == 7 ) // Widget