Remove some unneeded html_safe calls