clean up and prepare to officially start upgrading on dev branch