Removing Groups from backend logic