diff --git a/apidocs/bbonfhir_swagger.yaml b/apidocs/bbonfhir_swagger.yaml
index 7a381eb0a..e939ee975 100644
--- a/apidocs/bbonfhir_swagger.yaml
+++ b/apidocs/bbonfhir_swagger.yaml
@@ -44,7 +44,7 @@ tags:
 schemes:
   - https
 paths:
-  /bluebutton/fhir/v1/metadata:
+  /v1/fhir/metadata:
     get:
       tags:
         - CapabilityStatement
diff --git a/apps/dot_ext/urls.py b/apps/dot_ext/urls.py
index 8977f5ab2..83a22db9c 100644
--- a/apps/dot_ext/urls.py
+++ b/apps/dot_ext/urls.py
@@ -1,5 +1,4 @@
 from django.conf.urls import include, url
-# from django.views.generic import TemplateView
 from . import views
 
 oauth2_provider_urls = ([
diff --git a/apps/fhir/bluebutton/views/home.py b/apps/fhir/bluebutton/views/home.py
index d478db837..1f80330e0 100644
--- a/apps/fhir/bluebutton/views/home.py
+++ b/apps/fhir/bluebutton/views/home.py
@@ -24,39 +24,12 @@
 __author__ = 'Mark Scrimshire:@ekivemark'
 
 
-def oauth_fhir_conformance(request, via_oauth=True, *args, **kwargs):
-    """ Pull and filter fhir Conformance statement
-
-    BaseDstu2 = "Conformance"
-    BaseStu3 = "CapabilityStatement"
-
-    metadata call
-
-    """
-    return metadata(request, via_oauth=True, *args, **kwargs)
-
-
 def fhir_conformance(request, via_oauth=False, *args, **kwargs):
     """ Pull and filter fhir Conformance statement
 
     BaseDstu2 = "Conformance"
     BaseStu3 = "CapabilityStatement"
 
-    metadata call
-
-    """
-
-    return metadata(request, via_oauth=False, *args, **kwargs)
-
-
-def metadata(request, via_oauth=False, *args, **kwargs):
-    """
-    Arrive here to do capabilityStatement or Conformance
-    aka metadata
-
-    oauth_fhir_conformance sets via_oauth=True
-    fhir_conformance sets via_oauth=False
-
     :param request:
     :param via_oauth:
     :param args:
@@ -104,6 +77,7 @@ def metadata(request, via_oauth=False, *args, **kwargs):
     # Append Security to ConformanceStatement
     security_endpoint = build_oauth_resource(request, format_type="json")
     od['rest'][0]['security'] = security_endpoint
+    od['format'] = ['appliction/json']
 
     return JsonResponse(od)