Cleanup, again.