w3c clean up