cleanup: remove BranchBuilder, added more comments
remove check for condition that might not hold