General cleanup.

Fixes #12