Removing entities from groups is now done in the refresh phase
Include only the needed modules