Merge "Delete dead code."