Cleanup script now test if filename is same as system name
Renamed systems to match filenames of xml files