Clean up and updates.