html refactoring - replace <a> with HTML::link()
refactoring remove methods