diff --git a/platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/Admin.xml b/platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/Admin.xml
index fa18355..fddd39a 100644
--- a/platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/Admin.xml
+++ b/platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/Admin.xml
@@ -383,21 +383,6 @@
 <unmodifiable>0</unmodifiable>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </last_name>
-<pageWidth>
-<cache>0</cache>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<name>pageWidth</name>
-<number>17</number>
-<prettyName>Preferred page width</prettyName>
-<relationalStorage>0</relationalStorage>
-<separator> </separator>
-<separators> ,|</separators>
-<size>1</size>
-<unmodifiable>0</unmodifiable>
-<values>default|640|800|1024|1280|1600</values>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</pageWidth>
 <password>
 <name>password</name>
 <number>4</number>
@@ -498,9 +483,6 @@
 <last_name></last_name>
 </property>
 <property>
-<pageWidth>default</pageWidth>
-</property>
-<property>
 <password>admin</password>
 </property>
 <property>
diff --git a/platform/xwiki-applications/trunk/blog/src/main/resources/Blog/WebPreferences.xml b/platform/xwiki-applications/trunk/blog/src/main/resources/Blog/WebPreferences.xml
index 211a37d..5ffce65 100644
--- a/platform/xwiki-applications/trunk/blog/src/main/resources/Blog/WebPreferences.xml
+++ b/platform/xwiki-applications/trunk/blog/src/main/resources/Blog/WebPreferences.xml
@@ -170,18 +170,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </confirmation_email_content>
-<convertmail>
-<customDisplay></customDisplay>
-<name>convertmail</name>
-<number>50</number>
-<prettyName>convert email type</prettyName>
-<size>1</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</convertmail>
 <dateformat>
 <name>dateformat</name>
 <number>54</number>
@@ -256,30 +244,6 @@
 <values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </edit_registered>
-<editbox_height>
-<customDisplay></customDisplay>
-<name>editbox_height</name>
-<number>24</number>
-<prettyName>Editbox Height</prettyName>
-<size>5</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</editbox_height>
-<editbox_width>
-<customDisplay></customDisplay>
-<name>editbox_width</name>
-<number>23</number>
-<prettyName>Editbox Width</prettyName>
-<size>5</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</editbox_width>
 <editor>
 <cache>0</cache>
 <customDisplay></customDisplay>
@@ -480,96 +444,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </leftPanels>
-<macros_groovy>
-<customDisplay></customDisplay>
-<name>macros_groovy</name>
-<number>28</number>
-<prettyName>Macros for Groovy</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_groovy>
-<macros_languages>
-<customDisplay></customDisplay>
-<name>macros_languages</name>
-<number>26</number>
-<prettyName>Macros Languages</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_languages>
-<macros_mapping>
-<contenttype>FullyRenderedText</contenttype>
-<customDisplay></customDisplay>
-<editor>---</editor>
-<name>macros_mapping</name>
-<number>30</number>
-<prettyName>Macros Mapping</prettyName>
-<rows>15</rows>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</macros_mapping>
-<macros_velocity>
-<customDisplay></customDisplay>
-<name>macros_velocity</name>
-<number>27</number>
-<prettyName>Macros for Velocity</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_velocity>
-<macros_wiki>
-<customDisplay></customDisplay>
-<name>macros_wiki</name>
-<number>32</number>
-<prettyName>Macros for the Wiki Parser</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_wiki>
-<macros_wiki2>
-<customDisplay></customDisplay>
-<name>macros_wiki2</name>
-<number>29</number>
-<prettyName>Macros for new Wiki Parser</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_wiki2>
-<menu>
-<contenttype>FullyRenderedText</contenttype>
-<customDisplay></customDisplay>
-<editor>---</editor>
-<name>menu</name>
-<number>8</number>
-<prettyName>Menu</prettyName>
-<rows>8</rows>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</menu>
 <meta>
 <contenttype>FullyRenderedText</contenttype>
 <customDisplay></customDisplay>
@@ -599,39 +473,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
 </multilingual>
-<notification_pages>
-<customDisplay></customDisplay>
-<name>notification_pages</name>
-<number>33</number>
-<prettyName>Notification Pages</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</notification_pages>
-<pageWidth>
-<cache>0</cache>
-<customDisplay></customDisplay>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<name>pageWidth</name>
-<number>48</number>
-<picker></picker>
-<prettyName>Preferred page width</prettyName>
-<relationalStorage>0</relationalStorage>
-<separator> </separator>
-<separators> ,|</separators>
-<size>1</size>
-<sort>none</sort>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<values>default|640|800|1024|1280|1600</values>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</pageWidth>
 <parent>
 <name>parent</name>
 <number>52</number>
@@ -694,48 +535,6 @@
 <values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </registration_registered>
-<renderXWikiGroovyRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiGroovyRenderer</name>
-<number>42</number>
-<prettyName>Render Groovy code</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiGroovyRenderer>
-<renderXWikiRadeoxRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiRadeoxRenderer</name>
-<number>43</number>
-<prettyName>Render Wiki syntax</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiRadeoxRenderer>
-<renderXWikiVelocityRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiVelocityRenderer</name>
-<number>41</number>
-<prettyName>Render velocity code</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiVelocityRenderer>
 <rightPanels>
 <customDisplay></customDisplay>
 <name>rightPanels</name>
@@ -900,18 +699,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </version>
-<webbgcolor>
-<customDisplay></customDisplay>
-<name>webbgcolor</name>
-<number>2</number>
-<prettyName>Web Background Color</prettyName>
-<size>10</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</webbgcolor>
 <webcopyright>
 <customDisplay></customDisplay>
 <name>webcopyright</name>
@@ -957,9 +744,6 @@
 <confirmation_email_content></confirmation_email_content>
 </property>
 <property>
-<convertmail></convertmail>
-</property>
-<property>
 <dateformat></dateformat>
 </property>
 <property>
@@ -975,12 +759,6 @@
 <edit_registered></edit_registered>
 </property>
 <property>
-<editbox_height></editbox_height>
-</property>
-<property>
-<editbox_width></editbox_width>
-</property>
-<property>
 <editor></editor>
 </property>
 <property>
@@ -1041,39 +819,12 @@
 <leftPanels>Blog.RecentPostsPanel,Blog.UnpublishedPanel,Blog.CategoriesPanel,Blog.ArchivePanel</leftPanels>
 </property>
 <property>
-<macros_groovy></macros_groovy>
-</property>
-<property>
-<macros_languages></macros_languages>
-</property>
-<property>
-<macros_mapping></macros_mapping>
-</property>
-<property>
-<macros_velocity></macros_velocity>
-</property>
-<property>
-<macros_wiki></macros_wiki>
-</property>
-<property>
-<macros_wiki2></macros_wiki2>
-</property>
-<property>
-<menu></menu>
-</property>
-<property>
 <meta></meta>
 </property>
 <property>
 <multilingual></multilingual>
 </property>
 <property>
-<notification_pages></notification_pages>
-</property>
-<property>
-<pageWidth></pageWidth>
-</property>
-<property>
 <parent></parent>
 </property>
 <property>
@@ -1086,15 +837,6 @@
 <registration_registered></registration_registered>
 </property>
 <property>
-<renderXWikiGroovyRenderer></renderXWikiGroovyRenderer>
-</property>
-<property>
-<renderXWikiRadeoxRenderer></renderXWikiRadeoxRenderer>
-</property>
-<property>
-<renderXWikiVelocityRenderer></renderXWikiVelocityRenderer>
-</property>
-<property>
 <rightPanels></rightPanels>
 </property>
 <property>
@@ -1134,9 +876,6 @@
 <version></version>
 </property>
 <property>
-<webbgcolor></webbgcolor>
-</property>
-<property>
 <webcopyright></webcopyright>
 </property>
 </object>
diff --git a/platform/xwiki-applications/trunk/invitation/src/main/resources/Invitation/WebPreferences.xml b/platform/xwiki-applications/trunk/invitation/src/main/resources/Invitation/WebPreferences.xml
index 7f57236..047ea37 100644
--- a/platform/xwiki-applications/trunk/invitation/src/main/resources/Invitation/WebPreferences.xml
+++ b/platform/xwiki-applications/trunk/invitation/src/main/resources/Invitation/WebPreferences.xml
@@ -262,18 +262,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </confirmation_email_content>
-<convertmail>
-<customDisplay></customDisplay>
-<name>convertmail</name>
-<number>50</number>
-<prettyName>convert email type</prettyName>
-<size>1</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</convertmail>
 <core.defaultDocumentSyntax>
 <name>core.defaultDocumentSyntax</name>
 <number>59</number>
@@ -356,30 +344,6 @@
 <values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </edit_registered>
-<editbox_height>
-<customDisplay></customDisplay>
-<name>editbox_height</name>
-<number>24</number>
-<prettyName>Editbox Height</prettyName>
-<size>5</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</editbox_height>
-<editbox_width>
-<customDisplay></customDisplay>
-<name>editbox_width</name>
-<number>23</number>
-<prettyName>Editbox Width</prettyName>
-<size>5</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</editbox_width>
 <editor>
 <cache>0</cache>
 <customDisplay></customDisplay>
@@ -597,96 +561,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </leftPanels>
-<macros_groovy>
-<customDisplay></customDisplay>
-<name>macros_groovy</name>
-<number>28</number>
-<prettyName>Macros for Groovy</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_groovy>
-<macros_languages>
-<customDisplay></customDisplay>
-<name>macros_languages</name>
-<number>26</number>
-<prettyName>Macros Languages</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_languages>
-<macros_mapping>
-<contenttype>FullyRenderedText</contenttype>
-<customDisplay></customDisplay>
-<editor>---</editor>
-<name>macros_mapping</name>
-<number>30</number>
-<prettyName>Macros Mapping</prettyName>
-<rows>15</rows>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</macros_mapping>
-<macros_velocity>
-<customDisplay></customDisplay>
-<name>macros_velocity</name>
-<number>27</number>
-<prettyName>Macros for Velocity</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_velocity>
-<macros_wiki>
-<customDisplay></customDisplay>
-<name>macros_wiki</name>
-<number>32</number>
-<prettyName>Macros for the Wiki Parser</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_wiki>
-<macros_wiki2>
-<customDisplay></customDisplay>
-<name>macros_wiki2</name>
-<number>29</number>
-<prettyName>Macros for new Wiki Parser</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_wiki2>
-<menu>
-<contenttype>FullyRenderedText</contenttype>
-<customDisplay></customDisplay>
-<editor>---</editor>
-<name>menu</name>
-<number>8</number>
-<prettyName>Menu</prettyName>
-<rows>8</rows>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</menu>
 <meta>
 <contenttype>FullyRenderedText</contenttype>
 <customDisplay></customDisplay>
@@ -716,39 +590,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
 </multilingual>
-<notification_pages>
-<customDisplay></customDisplay>
-<name>notification_pages</name>
-<number>33</number>
-<prettyName>Notification Pages</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</notification_pages>
-<pageWidth>
-<cache>0</cache>
-<customDisplay></customDisplay>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<name>pageWidth</name>
-<number>48</number>
-<picker></picker>
-<prettyName>Preferred page width</prettyName>
-<relationalStorage>0</relationalStorage>
-<separator> </separator>
-<separators> ,|</separators>
-<size>1</size>
-<sort>none</sort>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<values>default|640|800|1024|1280|1600</values>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</pageWidth>
 <parent>
 <name>parent</name>
 <number>52</number>
@@ -811,48 +652,6 @@
 <values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </registration_registered>
-<renderXWikiGroovyRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiGroovyRenderer</name>
-<number>42</number>
-<prettyName>Render Groovy code</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiGroovyRenderer>
-<renderXWikiRadeoxRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiRadeoxRenderer</name>
-<number>43</number>
-<prettyName>Render Wiki syntax</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiRadeoxRenderer>
-<renderXWikiVelocityRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiVelocityRenderer</name>
-<number>41</number>
-<prettyName>Render velocity code</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiVelocityRenderer>
 <rightPanels>
 <customDisplay></customDisplay>
 <name>rightPanels</name>
@@ -1041,18 +840,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </version>
-<webbgcolor>
-<customDisplay></customDisplay>
-<name>webbgcolor</name>
-<number>2</number>
-<prettyName>Web Background Color</prettyName>
-<size>10</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</webbgcolor>
 <webcopyright>
 <customDisplay></customDisplay>
 <name>webcopyright</name>
@@ -1101,9 +888,6 @@
 <confirmation_email_content></confirmation_email_content>
 </property>
 <property>
-<convertmail></convertmail>
-</property>
-<property>
 <core.defaultDocumentSyntax></core.defaultDocumentSyntax>
 </property>
 <property>
@@ -1122,12 +906,6 @@
 <edit_registered>---</edit_registered>
 </property>
 <property>
-<editbox_height></editbox_height>
-</property>
-<property>
-<editbox_width></editbox_width>
-</property>
-<property>
 <editor>Text</editor>
 </property>
 <property>
@@ -1194,39 +972,12 @@
 <leftPanels></leftPanels>
 </property>
 <property>
-<macros_groovy></macros_groovy>
-</property>
-<property>
-<macros_languages></macros_languages>
-</property>
-<property>
-<macros_mapping></macros_mapping>
-</property>
-<property>
-<macros_velocity></macros_velocity>
-</property>
-<property>
-<macros_wiki></macros_wiki>
-</property>
-<property>
-<macros_wiki2></macros_wiki2>
-</property>
-<property>
-<menu></menu>
-</property>
-<property>
 <meta></meta>
 </property>
 <property>
 <multilingual></multilingual>
 </property>
 <property>
-<notification_pages></notification_pages>
-</property>
-<property>
-<pageWidth>default</pageWidth>
-</property>
-<property>
 <parent></parent>
 </property>
 <property>
@@ -1239,15 +990,6 @@
 <registration_registered>---</registration_registered>
 </property>
 <property>
-<renderXWikiGroovyRenderer></renderXWikiGroovyRenderer>
-</property>
-<property>
-<renderXWikiRadeoxRenderer></renderXWikiRadeoxRenderer>
-</property>
-<property>
-<renderXWikiVelocityRenderer></renderXWikiVelocityRenderer>
-</property>
-<property>
 <rightPanels></rightPanels>
 </property>
 <property>
@@ -1296,9 +1038,6 @@
 <version></version>
 </property>
 <property>
-<webbgcolor></webbgcolor>
-</property>
-<property>
 <webcopyright></webcopyright>
 </property>
 </object>
diff --git a/platform/xwiki-applications/trunk/panels/src/main/resources/Panels/WebPreferences.xml b/platform/xwiki-applications/trunk/panels/src/main/resources/Panels/WebPreferences.xml
index 42031bb..752e87a 100644
--- a/platform/xwiki-applications/trunk/panels/src/main/resources/Panels/WebPreferences.xml
+++ b/platform/xwiki-applications/trunk/panels/src/main/resources/Panels/WebPreferences.xml
@@ -184,18 +184,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </confirmation_email_content>
-<convertmail>
-<customDisplay></customDisplay>
-<name>convertmail</name>
-<number>50</number>
-<prettyName>convert email type</prettyName>
-<size>1</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</convertmail>
 <core.defaultDocumentSyntax>
 <name>core.defaultDocumentSyntax</name>
 <number>59</number>
@@ -278,30 +266,6 @@
 <values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </edit_registered>
-<editbox_height>
-<customDisplay></customDisplay>
-<name>editbox_height</name>
-<number>24</number>
-<prettyName>Editbox Height</prettyName>
-<size>5</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</editbox_height>
-<editbox_width>
-<customDisplay></customDisplay>
-<name>editbox_width</name>
-<number>23</number>
-<prettyName>Editbox Width</prettyName>
-<size>5</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</editbox_width>
 <editor>
 <cache>0</cache>
 <customDisplay></customDisplay>
@@ -511,96 +475,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </leftPanels>
-<macros_groovy>
-<customDisplay></customDisplay>
-<name>macros_groovy</name>
-<number>28</number>
-<prettyName>Macros for Groovy</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_groovy>
-<macros_languages>
-<customDisplay></customDisplay>
-<name>macros_languages</name>
-<number>26</number>
-<prettyName>Macros Languages</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_languages>
-<macros_mapping>
-<contenttype>FullyRenderedText</contenttype>
-<customDisplay></customDisplay>
-<editor>---</editor>
-<name>macros_mapping</name>
-<number>30</number>
-<prettyName>Macros Mapping</prettyName>
-<rows>15</rows>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</macros_mapping>
-<macros_velocity>
-<customDisplay></customDisplay>
-<name>macros_velocity</name>
-<number>27</number>
-<prettyName>Macros for Velocity</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_velocity>
-<macros_wiki>
-<customDisplay></customDisplay>
-<name>macros_wiki</name>
-<number>32</number>
-<prettyName>Macros for the Wiki Parser</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_wiki>
-<macros_wiki2>
-<customDisplay></customDisplay>
-<name>macros_wiki2</name>
-<number>29</number>
-<prettyName>Macros for new Wiki Parser</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_wiki2>
-<menu>
-<contenttype>FullyRenderedText</contenttype>
-<customDisplay></customDisplay>
-<editor>---</editor>
-<name>menu</name>
-<number>8</number>
-<prettyName>Menu</prettyName>
-<rows>8</rows>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</menu>
 <meta>
 <contenttype>FullyRenderedText</contenttype>
 <customDisplay></customDisplay>
@@ -630,39 +504,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
 </multilingual>
-<notification_pages>
-<customDisplay></customDisplay>
-<name>notification_pages</name>
-<number>33</number>
-<prettyName>Notification Pages</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</notification_pages>
-<pageWidth>
-<cache>0</cache>
-<customDisplay></customDisplay>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<name>pageWidth</name>
-<number>48</number>
-<picker></picker>
-<prettyName>Preferred page width</prettyName>
-<relationalStorage>0</relationalStorage>
-<separator> </separator>
-<separators> ,|</separators>
-<size>1</size>
-<sort>none</sort>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<values>default|640|800|1024|1280|1600</values>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</pageWidth>
 <parent>
 <name>parent</name>
 <number>52</number>
@@ -725,48 +566,6 @@
 <values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </registration_registered>
-<renderXWikiGroovyRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiGroovyRenderer</name>
-<number>42</number>
-<prettyName>Render Groovy code</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiGroovyRenderer>
-<renderXWikiRadeoxRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiRadeoxRenderer</name>
-<number>43</number>
-<prettyName>Render Wiki syntax</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiRadeoxRenderer>
-<renderXWikiVelocityRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiVelocityRenderer</name>
-<number>41</number>
-<prettyName>Render velocity code</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiVelocityRenderer>
 <rightPanels>
 <customDisplay></customDisplay>
 <name>rightPanels</name>
@@ -955,18 +754,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </version>
-<webbgcolor>
-<customDisplay></customDisplay>
-<name>webbgcolor</name>
-<number>2</number>
-<prettyName>Web Background Color</prettyName>
-<size>10</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</webbgcolor>
 <webcopyright>
 <customDisplay></customDisplay>
 <name>webcopyright</name>
diff --git a/platform/xwiki-applications/trunk/scheduler/src/main/resources/Scheduler/WebPreferences.xml b/platform/xwiki-applications/trunk/scheduler/src/main/resources/Scheduler/WebPreferences.xml
index 20dcd71..237edad 100644
--- a/platform/xwiki-applications/trunk/scheduler/src/main/resources/Scheduler/WebPreferences.xml
+++ b/platform/xwiki-applications/trunk/scheduler/src/main/resources/Scheduler/WebPreferences.xml
@@ -421,18 +421,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </confirmation_email_content>
-<convertmail>
-<customDisplay></customDisplay>
-<name>convertmail</name>
-<number>50</number>
-<prettyName>convert email type</prettyName>
-<size>1</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</convertmail>
 <core.defaultDocumentSyntax>
 <name>core.defaultDocumentSyntax</name>
 <number>59</number>
@@ -515,30 +503,6 @@
 <values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </edit_registered>
-<editbox_height>
-<customDisplay></customDisplay>
-<name>editbox_height</name>
-<number>24</number>
-<prettyName>Editbox Height</prettyName>
-<size>5</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</editbox_height>
-<editbox_width>
-<customDisplay></customDisplay>
-<name>editbox_width</name>
-<number>23</number>
-<prettyName>Editbox Width</prettyName>
-<size>5</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</editbox_width>
 <editor>
 <cache>0</cache>
 <customDisplay></customDisplay>
@@ -748,96 +712,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </leftPanels>
-<macros_groovy>
-<customDisplay></customDisplay>
-<name>macros_groovy</name>
-<number>28</number>
-<prettyName>Macros for Groovy</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_groovy>
-<macros_languages>
-<customDisplay></customDisplay>
-<name>macros_languages</name>
-<number>26</number>
-<prettyName>Macros Languages</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_languages>
-<macros_mapping>
-<contenttype>FullyRenderedText</contenttype>
-<customDisplay></customDisplay>
-<editor>---</editor>
-<name>macros_mapping</name>
-<number>30</number>
-<prettyName>Macros Mapping</prettyName>
-<rows>15</rows>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</macros_mapping>
-<macros_velocity>
-<customDisplay></customDisplay>
-<name>macros_velocity</name>
-<number>27</number>
-<prettyName>Macros for Velocity</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_velocity>
-<macros_wiki>
-<customDisplay></customDisplay>
-<name>macros_wiki</name>
-<number>32</number>
-<prettyName>Macros for the Wiki Parser</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_wiki>
-<macros_wiki2>
-<customDisplay></customDisplay>
-<name>macros_wiki2</name>
-<number>29</number>
-<prettyName>Macros for new Wiki Parser</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_wiki2>
-<menu>
-<contenttype>FullyRenderedText</contenttype>
-<customDisplay></customDisplay>
-<editor>---</editor>
-<name>menu</name>
-<number>8</number>
-<prettyName>Menu</prettyName>
-<rows>8</rows>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</menu>
 <meta>
 <contenttype>FullyRenderedText</contenttype>
 <customDisplay></customDisplay>
@@ -867,39 +741,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
 </multilingual>
-<notification_pages>
-<customDisplay></customDisplay>
-<name>notification_pages</name>
-<number>33</number>
-<prettyName>Notification Pages</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</notification_pages>
-<pageWidth>
-<cache>0</cache>
-<customDisplay></customDisplay>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<name>pageWidth</name>
-<number>48</number>
-<picker></picker>
-<prettyName>Preferred page width</prettyName>
-<relationalStorage>0</relationalStorage>
-<separator> </separator>
-<separators> ,|</separators>
-<size>1</size>
-<sort>none</sort>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<values>default|640|800|1024|1280|1600</values>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</pageWidth>
 <parent>
 <name>parent</name>
 <number>52</number>
@@ -962,48 +803,6 @@
 <values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </registration_registered>
-<renderXWikiGroovyRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiGroovyRenderer</name>
-<number>42</number>
-<prettyName>Render Groovy code</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiGroovyRenderer>
-<renderXWikiRadeoxRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiRadeoxRenderer</name>
-<number>43</number>
-<prettyName>Render Wiki syntax</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiRadeoxRenderer>
-<renderXWikiVelocityRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiVelocityRenderer</name>
-<number>41</number>
-<prettyName>Render velocity code</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiVelocityRenderer>
 <rightPanels>
 <customDisplay></customDisplay>
 <name>rightPanels</name>
@@ -1192,18 +991,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </version>
-<webbgcolor>
-<customDisplay></customDisplay>
-<name>webbgcolor</name>
-<number>2</number>
-<prettyName>Web Background Color</prettyName>
-<size>10</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</webbgcolor>
 <webcopyright>
 <customDisplay></customDisplay>
 <name>webcopyright</name>
diff --git a/platform/xwiki-applications/trunk/workstream/src/main/resources/Workstream/WebPreferences.xml b/platform/xwiki-applications/trunk/workstream/src/main/resources/Workstream/WebPreferences.xml
index a1b85bd..501c746 100644
--- a/platform/xwiki-applications/trunk/workstream/src/main/resources/Workstream/WebPreferences.xml
+++ b/platform/xwiki-applications/trunk/workstream/src/main/resources/Workstream/WebPreferences.xml
@@ -169,18 +169,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </confirmation_email_content>
-<convertmail>
-<customDisplay></customDisplay>
-<name>convertmail</name>
-<number>50</number>
-<prettyName>convert email type</prettyName>
-<size>1</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</convertmail>
 <default_language>
 <customDisplay></customDisplay>
 <name>default_language</name>
@@ -247,30 +235,6 @@
 <values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </edit_registered>
-<editbox_height>
-<customDisplay></customDisplay>
-<name>editbox_height</name>
-<number>24</number>
-<prettyName>Editbox Height</prettyName>
-<size>5</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</editbox_height>
-<editbox_width>
-<customDisplay></customDisplay>
-<name>editbox_width</name>
-<number>23</number>
-<prettyName>Editbox Width</prettyName>
-<size>5</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</editbox_width>
 <editor>
 <cache>0</cache>
 <customDisplay></customDisplay>
@@ -470,96 +434,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </leftPanels>
-<macros_groovy>
-<customDisplay></customDisplay>
-<name>macros_groovy</name>
-<number>28</number>
-<prettyName>Macros for Groovy</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_groovy>
-<macros_languages>
-<customDisplay></customDisplay>
-<name>macros_languages</name>
-<number>26</number>
-<prettyName>Macros Languages</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_languages>
-<macros_mapping>
-<contenttype>FullyRenderedText</contenttype>
-<customDisplay></customDisplay>
-<editor>---</editor>
-<name>macros_mapping</name>
-<number>30</number>
-<prettyName>Macros Mapping</prettyName>
-<rows>15</rows>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</macros_mapping>
-<macros_velocity>
-<customDisplay></customDisplay>
-<name>macros_velocity</name>
-<number>27</number>
-<prettyName>Macros for Velocity</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_velocity>
-<macros_wiki>
-<customDisplay></customDisplay>
-<name>macros_wiki</name>
-<number>32</number>
-<prettyName>Macros for the Wiki Parser</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_wiki>
-<macros_wiki2>
-<customDisplay></customDisplay>
-<name>macros_wiki2</name>
-<number>29</number>
-<prettyName>Macros for new Wiki Parser</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_wiki2>
-<menu>
-<contenttype>FullyRenderedText</contenttype>
-<customDisplay></customDisplay>
-<editor>---</editor>
-<name>menu</name>
-<number>8</number>
-<prettyName>Menu</prettyName>
-<rows>8</rows>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</menu>
 <meta>
 <contenttype>FullyRenderedText</contenttype>
 <customDisplay></customDisplay>
@@ -589,39 +463,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
 </multilingual>
-<notification_pages>
-<customDisplay></customDisplay>
-<name>notification_pages</name>
-<number>33</number>
-<prettyName>Notification Pages</prettyName>
-<size>60</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</notification_pages>
-<pageWidth>
-<cache>0</cache>
-<customDisplay></customDisplay>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<name>pageWidth</name>
-<number>48</number>
-<picker></picker>
-<prettyName>Preferred page width</prettyName>
-<relationalStorage>0</relationalStorage>
-<separator> </separator>
-<separators> ,|</separators>
-<size>1</size>
-<sort>none</sort>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<values>default|640|800|1024|1280|1600</values>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</pageWidth>
 <parent>
 <name>parent</name>
 <number>52</number>
@@ -684,48 +525,6 @@
 <values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
 </registration_registered>
-<renderXWikiGroovyRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiGroovyRenderer</name>
-<number>42</number>
-<prettyName>Render Groovy code</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiGroovyRenderer>
-<renderXWikiRadeoxRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiRadeoxRenderer</name>
-<number>43</number>
-<prettyName>Render Wiki syntax</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiRadeoxRenderer>
-<renderXWikiVelocityRenderer>
-<customDisplay></customDisplay>
-<defaultValue></defaultValue>
-<displayFormType>select</displayFormType>
-<displayType>yesno</displayType>
-<name>renderXWikiVelocityRenderer</name>
-<number>41</number>
-<prettyName>Render velocity code</prettyName>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiVelocityRenderer>
 <rightPanels>
 <customDisplay></customDisplay>
 <name>rightPanels</name>
@@ -890,18 +689,6 @@
 <validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </version>
-<webbgcolor>
-<customDisplay></customDisplay>
-<name>webbgcolor</name>
-<number>2</number>
-<prettyName>Web Background Color</prettyName>
-<size>10</size>
-<tooltip></tooltip>
-<unmodifiable>0</unmodifiable>
-<validationMessage></validationMessage>
-<validationRegExp></validationRegExp>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</webbgcolor>
 <webcopyright>
 <customDisplay></customDisplay>
 <name>webcopyright</name>
@@ -946,9 +733,6 @@
 <confirmation_email_content></confirmation_email_content>
 </property>
 <property>
-<convertmail></convertmail>
-</property>
-<property>
 <default_language></default_language>
 </property>
 <property>
@@ -961,12 +745,6 @@
 <edit_registered></edit_registered>
 </property>
 <property>
-<editbox_height></editbox_height>
-</property>
-<property>
-<editbox_width></editbox_width>
-</property>
-<property>
 <editor></editor>
 </property>
 <property>
@@ -1027,39 +805,12 @@
 <leftPanels></leftPanels>
 </property>
 <property>
-<macros_groovy></macros_groovy>
-</property>
-<property>
-<macros_languages></macros_languages>
-</property>
-<property>
-<macros_mapping></macros_mapping>
-</property>
-<property>
-<macros_velocity></macros_velocity>
-</property>
-<property>
-<macros_wiki></macros_wiki>
-</property>
-<property>
-<macros_wiki2></macros_wiki2>
-</property>
-<property>
-<menu></menu>
-</property>
-<property>
 <meta></meta>
 </property>
 <property>
 <multilingual></multilingual>
 </property>
 <property>
-<notification_pages></notification_pages>
-</property>
-<property>
-<pageWidth></pageWidth>
-</property>
-<property>
 <parent>XWiki</parent>
 </property>
 <property>
@@ -1072,15 +823,6 @@
 <registration_registered></registration_registered>
 </property>
 <property>
-<renderXWikiGroovyRenderer></renderXWikiGroovyRenderer>
-</property>
-<property>
-<renderXWikiRadeoxRenderer></renderXWikiRadeoxRenderer>
-</property>
-<property>
-<renderXWikiVelocityRenderer></renderXWikiVelocityRenderer>
-</property>
-<property>
 <rightPanels></rightPanels>
 </property>
 <property>
@@ -1120,9 +862,6 @@
 <version></version>
 </property>
 <property>
-<webbgcolor></webbgcolor>
-</property>
-<property>
 <webcopyright></webcopyright>
 </property>
 </object>
