diff --git a/xos/api/utility/loginview.py b/xos/api/utility/loginview.py
index 2dc79c6..49a6d16 100644
--- a/xos/api/utility/loginview.py
+++ b/xos/api/utility/loginview.py
@@ -5,9 +5,8 @@
 from rest_framework import generics
 from rest_framework.views import APIView
 from core.models import *
-from services.hpc.models import *
-from services.requestrouter.models import *
 from django.forms import widgets
+from django.forms.models import model_to_dict
 from django.core.exceptions import PermissionDenied
 from django.contrib.contenttypes.models import ContentType
 import json
@@ -98,4 +97,4 @@
 
     def post(self, request, format=None):
         sessionid = request.data.get("xossessionid", None)
-        return self.do_logout(request, sessionid)
\ No newline at end of file
+        return self.do_logout(request, sessionid)
diff --git a/xos/core/dashboard/views/view_common.py b/xos/core/dashboard/views/view_common.py
index ba78ffd..478f4d3 100644
--- a/xos/core/dashboard/views/view_common.py
+++ b/xos/core/dashboard/views/view_common.py
@@ -6,7 +6,6 @@
 import json
 from services.syndicate_storage.models import *
 from core.models import *
-from services.hpc.models import ContentProvider
 from operator import attrgetter
 from django import template
 from django.views.decorators.csrf import csrf_exempt
@@ -28,8 +27,6 @@
             context['userSliceInfo'] = userSliceTableFormatter(userSliceData)
         else:
             context['userSliceInfo'] = userSliceData
-#        context['cdnData'] = getCDNOperatorData(wait=False)
-#        context['cdnContentProviders'] = getCDNContentProviderData()
 
         (dashboards, unusedDashboards)= getDashboards(user)
         unusedDashboards=[x for x in unusedDashboards if x!="Customize"]
diff --git a/xos/core/xoslib/methods/loginview.py b/xos/core/xoslib/methods/loginview.py
index 2dc79c6..49a6d16 100644
--- a/xos/core/xoslib/methods/loginview.py
+++ b/xos/core/xoslib/methods/loginview.py
@@ -5,9 +5,8 @@
 from rest_framework import generics
 from rest_framework.views import APIView
 from core.models import *
-from services.hpc.models import *
-from services.requestrouter.models import *
 from django.forms import widgets
+from django.forms.models import model_to_dict
 from django.core.exceptions import PermissionDenied
 from django.contrib.contenttypes.models import ContentType
 import json
@@ -98,4 +97,4 @@
 
     def post(self, request, format=None):
         sessionid = request.data.get("xossessionid", None)
-        return self.do_logout(request, sessionid)
\ No newline at end of file
+        return self.do_logout(request, sessionid)