fix code in data.xml, remove not used code