More Update Prep and Cleanup