Cleanup & update.