Removing unecessary files. Some from merging, some that are outdated