Rid of client grouping for now