Merge "Remove unused file"