Tidy up html replacements
Added some html tags to clean
Remove dead code