more dom cleanup