Add code for showing git branch

and remove unused shortcuts