--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.properties	Fri Jun 11 11:47:38 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.properties	Fri Jun 11 17:06:37 2010 -0500
@@ -2,7 +2,6 @@
 template.desc=A simple Open C Hello World console application. \r\n\
 You can use this project type for all S60 3rd-Future Ed. SDKs with Open C support installed.
 directories.label=Project Directories
-#projectBasicSettings2xPage
 basics.label=Basic Settings
 basics.desc=Basic properties of a project
 basics.uid3.label=Application UID:

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.xml	Fri Jun 11 11:47:38 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.xml	Fri Jun 11 17:06:37 2010 -0500
@@ -2,7 +2,6 @@
 <!DOCTYPE template [
 <!ENTITY projectDirsPageCommonFields SYSTEM "../../shared/projectDirsPageCommonFields.inc">
 <!ENTITY projectCreateAndCommonFoldersProcess SYSTEM "../../shared/projectCreateAndCommonFoldersProcess.inc">
-<!ENTITY projectCommonFilesProcessParams2x SYSTEM "../../shared/projectCommonFilesProcessParams2x.inc">
 ]>
 <template 
 	version="1.0" 

--- a/templates/com.nokia.carbide.cpp.templates/templates/shared/projectBasicSettings2xPage.inc	Fri Jun 11 11:47:38 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<wizardPage 
-	id="basics" 
-	label="%projectBasicSettings2xPage.label">
-	<description>%projectBasicSettings2xPage.desc</description>
-	<uidField 
-			id="uid3"
-			label="%projectBasicSettings2xPage.uid3.label"
-			min="0x01000000"
-			max="0x0fffffff"
-			mandatory="true">
-			<description>%projectBasicSettings2xPage.uid3.desc</description>
-	</uidField>
-	<textField 
-			id="author"
-			label="%projectBasicSettings2xPage.author.label"
-			persist="true">
-			<description>%projectBasicSettings2xPage.author.desc</description>
-	</textField>
-	<textField 
-			id="copyright"
-			label="%projectBasicSettings2xPage.copyright.label"
-			multiline="true"
-			default="Your copyright notice"
-			persist="true">
-			<description>%projectBasicSettings2xPage.copyright.desc</description>
-	</textField>
-</wizardPage>

--- a/templates/com.nokia.carbide.cpp.templates/templates/shared/projectCommonFilesProcessParams2x.inc	Fri Jun 11 11:47:38 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-<parameter name="project" projectName="$(projectName)" />
-
-<!-- AIF DIR -->
-
-<parameter name="file"
-	sourcePath="aif/Basenameaif.rss" 
-	targetPath="$(aifDir)/$(baseName)aif.rss" 
-	/> 
-<parameter name="file"
-	sourcePath="aif/context_pane_icon.bmp" 
-	targetPath="$(aifDir)/context_pane_icon.bmp" 
-	substitute="false"
-	/> 
-<parameter name="file"
-	sourcePath="aif/context_pane_icon_mask.bmp"
-	targetPath="$(aifDir)/context_pane_icon_mask.bmp" 
-	substitute="false"
-	/> 
-<parameter name="file"
-	sourcePath="aif/list_icon.bmp" 
-	targetPath="$(aifDir)/list_icon.bmp" 
-	substitute="false"
-	/> 
-<parameter name="file"
-	sourcePath="aif/list_icon_mask.bmp" 
-	targetPath="$(aifDir)/list_icon_mask.bmp" 
-	substitute="false"
-	/> 
-	
-<!-- DATA DIR -->
-
-<parameter name="file"
-	sourcePath="data/Basename.rss" 
-	targetPath="$(dataDir)/$(baseName).rss" 
-	/> 
-<parameter name="file"
-	sourcePath="data/Basename_caption.rss" 
-	targetPath="$(dataDir)/$(baseName)_caption.rss" 
-	/> 
-	
-<!-- GROUP DIR -->
-	
-<parameter name="file"
-	sourcePath="group/bld.inf" 
-	targetPath="$(groupDir)/bld.inf" 
-	/> 
-<parameter name="file"
-	sourcePath="group/Basename.mmp" 
-	targetPath="$(groupDir)/$(baseName).mmp" 
-	/> 
-	
-<!-- HELP DIR -->
-
-<parameter name="file"
-	sourcePath="help/Basename.cshlp" 
-	targetPath="$(helpDir)/$(baseName).cshlp" 
-	/>
-<parameter name="file"
-	sourcePath="help/Basename.xml" 
-	targetPath="$(helpDir)/$(baseName).xml" 
-	/>
-<parameter name="file"
-	sourcePath="help/build_help.mk" 
-	targetPath="$(helpDir)/build_help.mk" 
-	/>
-<parameter name="file"
-	sourcePath="help/Custom.xml" 
-	targetPath="$(helpDir)/Custom.xml" 
-	/>