Cleanup.

Refs #105