Delete HtmlUnit, code cleanup