Updates and cleanup.