Start to fix branch issue
Remove ref to branch conversion code. unnecessary
Fix branching issue