Remove dead code and old comments.