Cleanups based on PR comments
Remove DEFAULT_BRANCH from the key - belongs elsewhere