Final branch cleanup