Cleanup.

Also, experimenting with a non-async version.