w3c cleanup