Use branch index and branch cell index to identify branch head
Removed obsolete code
p4#: 21974