clean up xmlns usage