I think we should remove it from the xml files