Updates, cleanup.