Removing unneeded logic from group manager