8190822: Remove dead code that could lead to invalid HTML

Reviewed-by: bpatel, ksrini
4 files changed