add a bit more dom cleanup