More cleanup.
Updating docs.