settings added and some files removed