Remove dead code & update comments.