Contextual list group cleanup

BS3 commits: 07de53c644b315852c5f315ab91bfd6d65660d50