Merge "Remove more dead code."