removing QName where appropriate