--- a/fep/aknfep/group/bld.inf	Mon May 03 12:49:54 2010 +0300
+++ b/fep/aknfep/group/bld.inf	Fri May 14 16:11:34 2010 +0300
@@ -62,9 +62,9 @@
 ../rom/aknfep_variant.iby                   CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(aknfep_variant.iby)
 ../rom/aknfepResources.iby                  LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(aknfepResources.iby)
 ../rom/aknfepuiinterface.iby                CORE_MW_LAYER_IBY_EXPORT_PATH(aknfepuiinterface.iby)
-../rom/peninputimeplugincn_Variant.iby      CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(peninputimeplugincn_Variant.iby)
-../rom/peninputimeplugingeneric.iby         CORE_MW_LAYER_IBY_EXPORT_PATH(peninputimeplugingeneric.iby)
-../rom/peninputimepluginitut_Variant.iby    CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(peninputimepluginitut_Variant.iby)
+//../rom/peninputimeplugincn_Variant.iby      CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(peninputimeplugincn_Variant.iby)
+//../rom/peninputimeplugingeneric.iby         CORE_MW_LAYER_IBY_EXPORT_PATH(peninputimeplugingeneric.iby)
+//../rom/peninputimepluginitut_Variant.iby    CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(peninputimepluginitut_Variant.iby)
 //../rom/PeninputPluginKr.iby                 CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(PeninputPluginKr.iby)
 //../rom/peninputimepluginjp_Variant.iby      CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(peninputimepluginjp_Variant.iby)
 
@@ -87,10 +87,10 @@
 ../UiPlugins/AknFepUiInterface/AvkonImpl/group/AknFepUiAvkonPlugin.mmp
 
 #ifdef RD_SCALABLE_UI_V2
-../peninputplugins/peninputimepluginitut/group/peninputimepluginitut.mmp
-../peninputplugins/peninputimeplugincn/group/peninputimeplugincn.mmp
+//../peninputplugins/peninputimepluginitut/group/peninputimepluginitut.mmp
+//../peninputplugins/peninputimeplugincn/group/peninputimeplugincn.mmp
 //../peninputplugins/peninputimepluginjp/group/peninputimepluginjp.mmp
-../peninputplugins/peninputimeplugingeneric/group/peninputimeplugingeneric.mmp
+//../peninputplugins/peninputimeplugingeneric/group/peninputimeplugingeneric.mmp
 //../peninputplugins/PeninputPluginKr/group/PeninputPluginKr.mmp
 #endif //RD_SCALABLE_UI_V2
 

--- a/fep/aknfep/src/AknFepPluginManager.cpp	Mon May 03 12:49:54 2010 +0300
+++ b/fep/aknfep/src/AknFepPluginManager.cpp	Fri May 14 16:11:34 2010 +0300
@@ -54,7 +54,7 @@
 #include <aknextendedinputcapabilities.h>
 #include <avkon.hrh>
 #include <PtiEngine.h>
-#include <peninputcommonlayoutglobalenum.h>
+//#include <peninputcommonlayoutglobalenum.h>
 #include <PtiCompositionDataIF.h> // MPtiEngineCompositionDataInterface
 #include <eikapp.h>
 #include <AknFepGlobalEnums.h>
@@ -3241,11 +3241,6 @@
         {
         newMode = ENumber;
         }
-    else if ( iPluginPrimaryRange == ERangeNativeNumber )
-        {
-        newMode = ENativeNumber;
-        iPluginNativeRange = ETrue;
-        }
     //else do NOTHING but keep current for other ranges
     
     if( newMode != iFepMan.InputMode() || 

--- a/package_definition.xml	Mon May 03 12:49:54 2010 +0300
+++ b/package_definition.xml	Fri May 14 16:11:34 2010 +0300
@@ -13,40 +13,10 @@
         <!-- <unit bldFile="textinput/peninputarc/src/peninputserverapp"/> -->
         <!-- <unit bldFile="textinput/peninputarc/utils/group"/> -->
       </component>
-      <component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
-        <unit bldFile="textinput/peninputcommonctrls/group"/>
-      </component>
-      <component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
-        <unit bldFile="textinput/peninputcommonlayout/group"/>
-      </component>
-      <component id="peninputgenerichwr" filter="s60" name="Pen Input Generic Handwriting Recognition" class="plugin">
-        <unit bldFile="textinput/peninputgenerichwr/group"/>
-      </component>
-      <component id="peninputgenericvkb" filter="s60" name="Pen Input Generic Virtual Keyboard" class="plugin">
-        <unit bldFile="textinput/peninputgenericvkb/group"/>
-      </component>
-      <component id="peninputhwrboxcn" filter="s60" name="Chinese Handwriting Recognition Box" class="plugin">
-        <unit bldFile="textinput/peninputhwrboxcn/group"/>
-      </component>
-      <component id="peninputvkbcn" filter="s60" name="Chinese Virtual Keyboard" class="plugin">
-        <unit bldFile="textinput/peninputvkbcn/group"/>
-      </component>
-      <component id="peninputcommonctrlsjp" filter="s60" name="Pen Input Common Controls Japanese">
-        <unit bldFile="textinput/peninputcommonctrlsjp/group"/>
-      </component>
-      <component id="peninputhwrboxjp" filter="s60" name="Japanese Handwriting Recognition Box" class="plugin">
-        <unit bldFile="textinput/peninputhwrboxjp/group"/>
-      </component>
-      <component id="peninputvkbjp" filter="s60" name="Japanese Virtual Keyboard" class="plugin">
-        <unit bldFile="textinput/peninputvkbjp/group"/>
-      </component>
       <component id="textinput_build" filter="s60" name="Text Input Build">
        <!--needs #ifdef moved to confguration or individual bld.inf files -->
         <unit bldFile="textinput/group"/>
       </component>
-      <component id="gslangplugin" filter="s60" name="GS Language Plugin" class="plugin">
-        <unit bldFile="textinput/gslangplugin"/>
-      </component>
     </collection>
     <collection id="fep" name="FEP" level="engine">
       <component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">

--- a/systemDefinitionLayer.xml	Mon May 03 12:49:54 2010 +0300
+++ b/systemDefinitionLayer.xml	Fri May 14 16:11:34 2010 +0300
@@ -84,21 +84,6 @@
       <unit unitID="inputmethods_textinput_aknfep_internal_fepautotestingtools_sourcecode_simulatorside_eventloganim" filter="not_build,test_internal" mrp="" name="eventloganim" bldFile="&layer_real_source_path;\textinput\aknfep\internal\fepautotestingtools\sourcecode\simulatorside\eventloganim\group" />
     </component>
   </module>
-  <module name="peninputimeplugincn">
-    <component name="peninputimeplugincn">
-      <unit unitID="inputmethods_textinput_aknfep_peninputplugins_peninputimeplugincn" filter="not_build" mrp="" name="peninputimeplugincn" bldFile="&layer_real_source_path;\textinput\aknfep\peninputplugins\peninputimeplugincn\group" />
-    </component>
-  </module>
-  <module name="peninputimeplugingeneric">
-    <component name="peninputimeplugingeneric">
-      <unit unitID="inputmethods_textinput_aknfep_peninputplugins_peninputimeplugingeneric" filter="not_build" mrp="" name="peninputimeplugingeneric" bldFile="&layer_real_source_path;\textinput\aknfep\peninputplugins\peninputimeplugingeneric\group" />
-    </component>
-  </module>
-  <module name="peninputimepluginjp">
-    <component name="peninputimepluginjp">
-      <unit unitID="inputmethods_textinput_aknfep_peninputplugins_peninputimepluginjp" filter="not_build" mrp="" name="peninputimepluginjp" bldFile="&layer_real_source_path;\textinput\aknfep\peninputplugins\peninputimepluginjp\group" />
-    </component>
-  </module>
   <module name="AknFepUiInterface">
     <component name="AknFepUiInterface">
       <unit unitID="inputmethods_textinput_aknfep_UiPlugins_AknFepUiInterface" mrp="" filter="not_build" name="AknFepUiInterface" bldFile="&layer_real_source_path;\textinput\aknfep\UiPlugins\AknFepUiInterface\group" />
@@ -114,16 +99,6 @@
       <unit unitID="inputmethods_textinput_AknInputLanguage" mrp="" filter="not_build" name="AknInputLanguage" bldFile="&layer_real_source_path;\textinput\AknInputLanguage\group" />
     </component>
   </module>
-  <module name="Matsutake">
-    <component name="Matsutake">
-      <unit unitID="inputmethods_textinput_Matsutake" mrp="" filter="not_build" name="Matsutake" bldFile="&layer_real_source_path;\textinput\Matsutake\group" />
-    </component>
-  </module>
-  <module name="ocrsrv">
-    <component name="ocrsrv">
-      <unit unitID="inputmethods_textinput_ocrsrv" mrp="" filter="not_build" name="ocrsrv" bldFile="&layer_real_source_path;\textinput\ocrsrv\group" />
-    </component>
-  </module>
   <module name="Ocrtest">
     <component name="Ocrtest">
       <unit unitID="inputmethods_textinput_ocrsrv_internal_Ocrtest" filter="not_build,test_internal" mrp="" name="Ocrtest" bldFile="&layer_real_source_path;\textinput\ocrsrv\internal\Ocrtest\group" />
@@ -144,56 +119,6 @@
       <unit unitID="inputmethods_textinput_peninputarc_utils" filter="not_build" mrp="" name="utils" bldFile="&layer_real_source_path;\textinput\peninputarc\utils\group" />
     </component>
   </module>
-  <module name="peninputcommonctrls">
-    <component name="peninputcommonctrls">
-      <unit unitID="inputmethods_textinput_peninputcommonctrls" mrp="" filter="not_build" name="peninputcommonctrls" bldFile="&layer_real_source_path;\textinput\peninputcommonctrls\group" />
-    </component>
-  </module>
-  <module name="peninputcommonlayout">
-    <component name="peninputcommonlayout">
-      <unit unitID="inputmethods_textinput_peninputcommonlayout" mrp="" filter="not_build" name="peninputcommonlayout" bldFile="&layer_real_source_path;\textinput\peninputcommonlayout\group" />
-    </component>
-  </module>
-  <module name="peninputgenerichwr">
-    <component name="peninputgenerichwr">
-      <unit unitID="inputmethods_textinput_peninputgenerichwr" mrp="" filter="not_build" name="peninputgenerichwr" bldFile="&layer_real_source_path;\textinput\peninputgenerichwr\group" />
-    </component>
-  </module>
-  <module name="peninputgenericvkb">
-    <component name="peninputgenericvkb">
-      <unit unitID="inputmethods_textinput_peninputgenericvkb" mrp="" filter="not_build" name="peninputgenericvkb" bldFile="&layer_real_source_path;\textinput\peninputgenericvkb\group" />
-    </component>
-  </module>
-  <module name="peninputhwrboxcn">
-    <component name="peninputhwrboxcn">
-      <unit unitID="inputmethods_textinput_peninputhwrboxcn" mrp="" filter="not_build" name="peninputhwrboxcn" bldFile="&layer_real_source_path;\textinput\peninputhwrboxcn\group" />
-    </component>
-  </module>
-  <module name="peninputvkbcn">
-    <component name="peninputvkbcn">
-      <unit unitID="inputmethods_textinput_peninputvkbcn" mrp="" filter="not_build" name="peninputvkbcn" bldFile="&layer_real_source_path;\textinput\peninputvkbcn\group" />
-    </component>
-  </module>
-  <module name="PtiAtokCore">
-    <component name="PtiAtokCore">
-      <unit unitID="inputmethods_textinput_PtiAtokCore" mrp="" filter="not_build" name="PtiAtokCore" bldFile="&layer_real_source_path;\textinput\PtiAtokCore\group" />
-    </component>
-  </module>
-  <module name="AtokTest">
-    <component name="AtokTest">
-      <unit unitID="inputmethods_textinput_PtiAtokCore_internal_AtokTest" filter="not_build,test_internal" mrp="" name="AtokTest" bldFile="&layer_real_source_path;\textinput\PtiAtokCore\internal\AtokTest\group" />
-    </component>
-  </module>
-  <module name="pticpicore">
-    <component name="pticpicore">
-      <unit unitID="inputmethods_textinput_pticpicore" mrp="" filter="not_build" name="pticpicore" bldFile="&layer_real_source_path;\textinput\pticpicore\group" />
-    </component>
-  </module>
-  <module name="cpiengine">
-    <component name="cpiengine">
-      <unit unitID="inputmethods_textinput_pticpicore_cpiengine" filter="not_build" mrp="" name="cpiengine" bldFile="&layer_real_source_path;\textinput\pticpicore\cpiengine\group" />
-    </component>
-  </module>
   <module name="PtiEngine">
     <component name="PtiEngine">
       <unit unitID="inputmethods_textinput_PtiEngine" mrp="" filter="not_build" name="PtiEngine" bldFile="&layer_real_source_path;\textinput\PtiEngine\group" />
@@ -204,49 +129,4 @@
       <unit unitID="inputmethods_textinput_PtiEngine_internal_PtiTest" filter="not_build,test_internal" mrp="" name="PtiTest" bldFile="&layer_real_source_path;\textinput\PtiEngine\internal\PtiTest\group" />
     </component>
   </module>
-  <module name="ptihanwangcore">
-    <component name="ptihanwangcore">
-      <unit unitID="inputmethods_textinput_ptihanwangcore" mrp="" filter="not_build" name="ptihanwangcore" bldFile="&layer_real_source_path;\textinput\ptihanwangcore\group" />
-    </component>
-  </module>
-  <module name="ptiindicphoneticcore">
-    <component name="ptiindicphoneticcore">
-      <unit unitID="inputmethods_textinput_ptiindicphoneticcore" mrp="" filter="not_build" name="ptiindicphoneticcore" bldFile="&layer_real_source_path;\textinput\ptiindicphoneticcore\group" />
-    </component>
-  </module>
-  <module name="IndicPhoneticInputTest">
-    <component name="IndicPhoneticInputTest">
-      <unit unitID="inputmethods_textinput_ptiindicphoneticcore_internal_IndicPhoneticInputTest" filter="not_build,test_internal" mrp="" name="IndicPhoneticInputTest" bldFile="&layer_real_source_path;\textinput\ptiindicphoneticcore\internal\IndicPhoneticInputTest\group" />
-    </component>
-  </module>
-  <module name="PtiT9Core">
-    <component name="PtiT9Core">
-      <unit unitID="inputmethods_textinput_PtiT9Core" filter="not_build" mrp="" name="PtiT9Core" bldFile="&layer_real_source_path;\textinput\PtiT9Core\group" />
-    </component>
-  </module>
-  <module name="peninputcommonctrlsjp">
-    <component name="peninputcommonctrlsjp">
-      <unit unitID="inputmethods_textinput_peninputcommonctrlsjp" mrp="" filter="not_build,test_internal" bldFile="&layer_real_source_path;\textinput\peninputcommonctrlsjp\group" name="peninputcommonctrlsjp" />
-    </component>
-  </module>
-  <module name="peninputhwrboxjp">
-    <component name="peninputhwrboxjp">
-      <unit unitID="inputmethods_textinput_peninputhwrboxjp" mrp="" filter="not_build,test_internal" bldFile="&layer_real_source_path;\textinput\peninputhwrboxjp\group" name="peninputhwrboxjp" />
-    </component>
-  </module>
-  <module name="peninputvkbjp">
-    <component name="peninputvkbjp">
-      <unit unitID="inputmethods_textinput_peninputvkbjp" mrp="" filter="not_build,test_internal" bldFile="&layer_real_source_path;\textinput\peninputvkbjp\group" name="peninputvkbjp" />
-    </component>
-  </module>
-  <module name="PtiDecumaJpCore">
-    <component name="PtiDecumaJpCore">
-      <unit unitID="inputmethods_textinput_PtiDecumaJpCore" mrp="" filter="not_build,test_internal" bldFile="&layer_real_source_path;\textinput\PtiDecumaJpCore\group" name="PtiDecumaJpCore" />
-    </component>
-  </module>
-  <module name="dltjdbtest">
-    <component name="dltjdbtest">
-      <unit unitID="inputmethods_textinput_PtiDecumaJpCore_internal_dltjdbtest" mrp="" filter="not_build,test_internal" bldFile="&layer_real_source_path;\textinput\PtiDecumaJpCore\internal\dltjdbtest\group" name="dltjdbtest" />
-    </component>
-  </module>
 </layer>

--- a/textinput/group/bld.inf	Mon May 03 12:49:54 2010 +0300
+++ b/textinput/group/bld.inf	Fri May 14 16:11:34 2010 +0300
@@ -35,20 +35,3 @@
 #include "../akninputlanguage/group/bld.inf"
 #endif
 #include "../peninputarc/group/bld.inf"
-#include "../peninputcommonctrls/group/bld.inf"
-//#include "../peninputhwrboxcn/group/bld.inf"
-//#include "../peninputvkbcn/group/bld.inf"
-#include "../peninputcommonlayout/group/bld.inf"
-//#include "../peninputgenerichwr/group/bld.inf"
-//#include "../peninputgenericvkb/group/bld.inf"
-//#include "../peninputcommonctrlsjp/group/bld.inf"
-//#include "../peninputhwrboxjp/group/bld.inf"
-//#include "../peninputvkbjp/group/bld.inf"
-//#include "../GSLangPlugin/bld.inf"
-//#include "../peninputgenericitut/group/bld.inf"
-#include "../peninputhwrtrui/group/bld.inf"
-//#include "../peninputhwrfscn/group/bld.inf"
-//#include "../peninputvkbkr/group/bld.inf"
-//#include "../peninputfingerhwr/group/bld.inf"
-//#include "../peninputsplititut/group/bld.inf"
-//#include "../peninputsplitqwerty/group/bld.inf"

--- a/textinput/peninputarc/rom/peninputarc.iby	Mon May 03 12:49:54 2010 +0300
+++ b/textinput/peninputarc/rom/peninputarc.iby	Fri May 14 16:11:34 2010 +0300
@@ -37,11 +37,7 @@
 S60_APP_AIF_RSC(peninputserver)
 data = \EPOC32\DATA\Z\resource\apps\peninputserver.RSC 	"resource\apps\peninputserver.rsc" 
 
-//ECOM_PLUGIN(gspeninputplugin.dll, gspeninputplugin.rsc)
 ECOM_PLUGIN(2000B5E7.dll, 2000B5E7.rss)
-//S60_APP_AIF_ICONS(gspeninputplugin)
-//S60_APP_EXE(peninputsetting)
-//S60_APP_AIF_RSC(peninputsetting)
 
 #endif //__PEN_SUPPORT
 

--- a/textinput/peninputarc/rom/peninputarcresources.iby	Mon May 03 12:49:54 2010 +0300
+++ b/textinput/peninputarc/rom/peninputarcresources.iby	Fri May 14 16:11:34 2010 +0300
@@ -26,9 +26,6 @@
 
 #ifdef __PEN_SUPPORT
 
-data = \EPOC32\DATA\Z\resource\gspeninputpluginrsc.RSC 	"resource\gspeninputpluginrsc.rsc" 
-
-S60_APP_RESOURCE(peninputsetting)
 
 #endif //__PEN_SUPPORT