(PUP-1699) Remove dead code, fix documentation.

This fixes a number of comments from review.