WIP: remove dead code.