Merge "Remove system-*.txt files"