Clean up HTML

Remove some deprecated stuff, and fix a few other things.