Remove dependency on html5