0.9: Cleanup.