HTML5 cleanup