Removed nasty many to many relationships from xml files