Clean up script and remove some merged cherry-picks