Merge "Remove unused declarations of dead code."