Merge "Remove empty files that are no longer referenced."