Remove obsolete stuff.
Merge conflict.