More ugly html removal