Merge "Remove unused files"