Kill deprecated stuff.
Merge.