Bug fix.
Cleanup.