Cleanup Group migration from Model to Entity