Merge "Remove redundant files"