Merge "Remove current.txt files"