Add htmlcleanup and fix linkcleanup