remove untested code
remove mock for current_branch
Merge branch 'remove-untested-code'

* remove-untested-code:
  remove mock for current_branch
  remove untested code