Remove old groovy stacks & update branch names