Merge "Remove two dead files."