Merge branch 'master' of github.com:open-cloud/xos
diff --git a/xos/core/models/instance.py b/xos/core/models/instance.py
index cd7dd26..62a86c4 100644
--- a/xos/core/models/instance.py
+++ b/xos/core/models/instance.py
@@ -15,7 +15,6 @@
from core.models import Flavor
from django.contrib.contenttypes import generic
from xos.config import Config
-from monitor import driver as monitor
from django.core.exceptions import PermissionDenied, ValidationError
config = Config()
diff --git a/xos/core/views/hpc_config.py b/xos/core/views/hpc_config.py
index 3c1baa2..7f3f5a5 100644
--- a/xos/core/views/hpc_config.py
+++ b/xos/core/views/hpc_config.py
@@ -1,5 +1,4 @@
from django.http import HttpResponse, HttpResponseServerError
-from monitor import driver
from core.models import *
from services.hpc.models import *
from services.requestrouter.models import *
diff --git a/xos/core/views/observer.py b/xos/core/views/observer.py
index 2912db9..3aabc4a 100644
--- a/xos/core/views/observer.py
+++ b/xos/core/views/observer.py
@@ -1,5 +1,4 @@
from django.http import HttpResponse
-from monitor import driver
from core.models import *
import json
import os
diff --git a/xos/core/views/serviceGraph.py b/xos/core/views/serviceGraph.py
index e11988b..5ce0581 100644
--- a/xos/core/views/serviceGraph.py
+++ b/xos/core/views/serviceGraph.py
@@ -1,7 +1,6 @@
from django.http import HttpResponse
from django.views.generic import TemplateView, View
from django import template
-from monitor import driver
from core.models import *
import json
import os
diff --git a/xos/services/helloworld/view.py b/xos/services/helloworld/view.py
index ab170a2..6ad9ae1 100644
--- a/xos/services/helloworld/view.py
+++ b/xos/services/helloworld/view.py
@@ -1,7 +1,6 @@
from django.http import HttpResponse
from django.views.generic import TemplateView, View
from django import template
-from monitor import driver
from core.models import *
from services.helloworld.models import *
import json