Merge "Remove duplicated irrelevant-files for sanity check"