Remove dead code. Improve doc comments.