Remove cs_group_map fro now