Merge "Remove unused files." into main