Remove an unused symbol.
Remove unnecessary differences against upstream. These can be revised later.
WIP dump #3.