Simplify, remove dead code.