[ET Trac] #2490: remove no longer used branches in McLachlan