got rid of deprecated vcs context and added branch checking