Modified and removed some files