Xml formating
Obsolete tags removed