Merge "Remove unused (and empty) file."