Fix defunct branches