diff --git a/lms/envs/analyticsserver.py b/lms/envs/analyticsserver.py
index a72d6bedc5..362698da20 100644
--- a/lms/envs/analyticsserver.py
+++ b/lms/envs/analyticsserver.py
@@ -23,9 +23,8 @@ ROOT_URLCONF = 'lms.urls'
 
 # import sys
 
-from .common import *
 from .dev import *
-from logsettings import get_logger_config
+# from logsettings import get_logger_config
 
 MITX_FEATURES['RUN_AS_ANALYTICS_SERVER_ENABLED'] = True
 
@@ -36,10 +35,9 @@ INSTALLED_APPS = INSTALLED_APPS + ( 'djeventstream.httphandler',
     'edinsights.modulefs',
 )
 
-INSTALLED_ANALYTICS_MODULES = open("../analytics_modules.txt").readlines()
-INSTALLED_ANALYTICS_MODULES = [x.strip() for x in INSTALLED_ANALYTICS_MODULES if x and len(x)>1]
-
-print "======JUHO==========", INSTALLED_ANALYTICS_MODULES
+INSTALLED_ANALYTICS_MODULES = ['edxdataanalytic.edxdataanalytic', 'video_heatmap.video_heatmap']
+# INSTALLED_ANALYTICS_MODULES = open("../analytics_modules.txt").readlines()
+# INSTALLED_ANALYTICS_MODULES = [x.strip() for x in INSTALLED_ANALYTICS_MODULES if x and len(x)>1]
 
 DJFS = { 'type' : 'osfs',
          'directory_root' : '/tmp/djfsmodule',
@@ -47,6 +45,5 @@ DJFS = { 'type' : 'osfs',
        }
 
 import djcelery
-
 djcelery.setup_loader()
 default_optional_kwargs = ['fs','db','query']
diff --git a/lms/urls.py b/lms/urls.py
index cec118fe7d..7f5e8aa9f1 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -355,7 +355,11 @@ if settings.MITX_FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
 
 if settings.MITX_FEATURES.get('RUN_AS_ANALYTICS_SERVER_ENABLED'):
     urlpatterns += (
-        url('^', include('edinsights.core.urls')),
+        # url('^', include('edinsights.core.urls')),
+        url(r'^view/([A-Za-z_+]+)$', 'edinsights.core.views.handle_view'),
+        url(r'^query/([A-Za-z_+]+)$', 'edinsights.core.views.handle_query'),
+        url(r'^schema$', 'edinsights.core.views.schema'),
+        url(r'^event_properties$', 'edinsights.core.views.event_properties'),
     )
     import edinsights.core.registry