Merge "Remove unused code"

No match.