Inconsistent branch name

Hello,

I'm using TeamCity 8.0.5 with git (github). I seem to get inconsistent branch name in the main display. Sometimes it says "master" and sometimes it says "refs/head/master". I can't figure out what causes it, but I can see that the URL includes either branch_PROJECT=<default> or branch_PROJECT=master. The default branch on my VCS root is set to the string "master". Anyone have suggestions on how to make this always say master?

Another question is how I get rid of the "build-19" branch you can see in the picture? It was a mistake and I want it gone.

Thanks,
/Hakan