[TASK] Prepare Group ViewHelper for removal