HTML Cleanup, upstream does it