removes unused xml files and removes two classes which were renamed.