Merge "Remove the unused file"