Fix ask_branch
Cleanup