Make HTML code validate; remove unused structure