Minor cleanup of dead code and documentation.