diff --git a/xep-0174.xml b/xep-0174.xml
index dece83ce..738f9fa1 100644
--- a/xep-0174.xml
+++ b/xep-0174.xml
@@ -174,10 +174,8 @@ juliet IN TXT "hash=sha-1"
 juliet IN TXT "jid=juliet@capulet.lit"
 juliet IN TXT "last=Capulet"
 juliet IN TXT "msg=Hanging out downtown"
-juliet IN TXT "n=Adium"
 juliet IN TXT "nick=JuliC"
 juliet IN TXT "node=http://www.adiumx.com"
-juliet IN TXT "os=PPC Mac OS X Mach-O"
 juliet IN TXT "phsh=a3839614e1a382bcfebbcf20464f519e81770813"
 juliet IN TXT "port.p2pj=5562"
 juliet IN TXT "status=avail"
@@ -312,10 +310,8 @@ juliet IN TXT "hash=sha-1"
 juliet IN TXT "jid=juliet@capulet.lit"
 juliet IN TXT "last=Capulet"
 juliet IN TXT "msg=Hanging out downtown"
-juliet IN TXT "n=Adium"
 juliet IN TXT "nick=JuliC"
 juliet IN TXT "node=http://www.adiumx.com"
-juliet IN TXT "os=PPC Mac OS X Mach-O"
 juliet IN TXT "phsh=a3839614e1a382bcfebbcf20464f519e81770813"
 juliet IN TXT "port.p2pj=5562"
 juliet IN TXT "status=avail"
@@ -562,16 +558,6 @@ _presence._tcp.local. IN NULL raw-binary-data-here
   <status>optional</status>
 </record>
 
-<record>
-  <name>n</name>
-  <desc>
-    The application name; the value of this record MUST be the same 
-    as that provided via normal XMPP presence (if applicable) in the 
-    'n' attribute specified in Entity Capabilities (XEP-0115).
-  </desc>
-  <status>optional</status>
-</record>
-
 <record>
   <name>nick</name>
   <desc>A friendly or informal name for the user.</desc>
@@ -588,16 +574,6 @@ _presence._tcp.local. IN NULL raw-binary-data-here
   <status>recommended</status>
 </record>
 
-<record>
-  <name>os</name>
-  <desc>
-    The operating system; the value of this record MUST be the same 
-    as that provided via normal XMPP presence (if applicable) in the 
-    'os' attribute specified in Entity Capabilities (XEP-0115).
-  </desc>
-  <status>optional</status>
-</record>
-
 <record>
   <name>phsh</name>
   <desc>