Updated version.
Cleanup.