diff --git a/core-person.json b/core-person.json
index b200826..13a5e7d 100644
--- a/core-person.json
+++ b/core-person.json
@@ -1,5 +1,5 @@
 {
-  "$id": "https://github.internet2.edu/TIER/schema/edit/master/core-person.json",
+  "$id": "core-person",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "A core representation of a person",
   "type": "object",
@@ -12,7 +12,7 @@
     "name" : {
     "type" : "array",
     "items" : {
-        "$ref" : "https://github.internet2.edu/TIER/schema/edit/master/core-person.json#/definitions/schema/name"
+        "$ref" : "#/components/schemas/name"
         }
     },
     "familyName": {
@@ -67,8 +67,6 @@
         }
       }
     },
-    "adr": { "$ref": "http://example.com/address.schema.json" },
-    "geo": { "$ref": "http://example.com/geographical-location.schema.json" },
     "tz": {
       "type": "string"
     },
@@ -102,9 +100,9 @@
       }
     }
   },
-  "components": 
+  "components":
   {
-    "schemas": 
+    "schemas":
     {
       "name": {
         "type": "object",