Clean up and update