wip : group matrix removal