Remove dead code
Remove silly comment
Use new html structure for index page headers
Add image type to header data model