Merge "Remove dead code."