removing group logic from frontend