Remove dead code, simplify.