second batch of DOM cleanup