Cleanup and update.