Clean up stuff, but still no HTML 5 support