Bug 5928 follow up remove branchcode label