remove SameFolder
update