refactor: replace hand-rolled utilities and dead code with the shared forms - #7021

Bugbot Analysis Progress (5m 6s elapsed)

✅ Gathered PR context (9s)
✅ Completed bug detection (4m 56s)
✅ Posted analysis results (1s)

Final Result: Bugbot completed review - no issues found! ✅

Request ID: serverGenReqId_14ea4258-1e02-4d62-841f-f7b5e75c0d54