diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..408f215
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.opencord.org
+port=29418
+project=hypercache.git
+defaultremote=origin
+defaultbranch=master
diff --git a/xos/tosca/resources/cdnprefix.py b/xos/tosca/resources/cdnprefix.py
index 8daf7fb..0b946ed 100644
--- a/xos/tosca/resources/cdnprefix.py
+++ b/xos/tosca/resources/cdnprefix.py
@@ -1,13 +1,5 @@
-import os
-import pdb
-import sys
-import tempfile
-sys.path.append("/opt/tosca")
-from translator.toscalib.tosca_template import ToscaTemplate
-
-from services.hpc.models import CDNPrefix, ContentProvider
-
 from xosresource import XOSResource
+from services.hpc.models import CDNPrefix, ContentProvider
 
 class XOSCDNPrefix(XOSResource):
     provides = "tosca.nodes.CDNPrefix"
diff --git a/xos/tosca/resources/cdnservice.py b/xos/tosca/resources/cdnservice.py
index 4082938..6dc73f0 100644
--- a/xos/tosca/resources/cdnservice.py
+++ b/xos/tosca/resources/cdnservice.py
@@ -1,13 +1,5 @@
-import os
-import pdb
-import sys
-import tempfile
-sys.path.append("/opt/tosca")
-from translator.toscalib.tosca_template import ToscaTemplate
-
-from services.hpc.models import HpcService
-
 from service import XOSService
+from services.hpc.models import HpcService
 
 class XOSCdnService(XOSService):
     provides = "tosca.nodes.CDNService"
diff --git a/xos/tosca/resources/contentprovider.py b/xos/tosca/resources/contentprovider.py
index 66742ea..e69375c 100644
--- a/xos/tosca/resources/contentprovider.py
+++ b/xos/tosca/resources/contentprovider.py
@@ -1,13 +1,5 @@
-import os
-import pdb
-import sys
-import tempfile
-sys.path.append("/opt/tosca")
-from translator.toscalib.tosca_template import ToscaTemplate
-
-from services.hpc.models import ContentProvider, ServiceProvider
-
 from xosresource import XOSResource
+from services.hpc.models import ContentProvider, ServiceProvider
 
 class XOSContentProvider(XOSResource):
     provides = "tosca.nodes.ContentProvider"
diff --git a/xos/tosca/resources/hpchealthcheck.py b/xos/tosca/resources/hpchealthcheck.py
index 93a0912..44d6f4c 100644
--- a/xos/tosca/resources/hpchealthcheck.py
+++ b/xos/tosca/resources/hpchealthcheck.py
@@ -1,15 +1,5 @@
-import importlib
-import os
-import pdb
-import sys
-import tempfile
-sys.path.append("/opt/tosca")
-from translator.toscalib.tosca_template import ToscaTemplate
-import pdb
-
-from services.hpc.models import HpcHealthCheck, HpcService
-
 from xosresource import XOSResource
+from services.hpc.models import HpcHealthCheck, HpcService
 
 class XOSHpcHealthCheck(XOSResource):
     provides = "tosca.nodes.HpcHealthCheck"
diff --git a/xos/tosca/resources/originserver.py b/xos/tosca/resources/originserver.py
index 46cf87e..03a0605 100644
--- a/xos/tosca/resources/originserver.py
+++ b/xos/tosca/resources/originserver.py
@@ -1,13 +1,5 @@
-import os
-import pdb
-import sys
-import tempfile
-sys.path.append("/opt/tosca")
-from translator.toscalib.tosca_template import ToscaTemplate
-
-from services.hpc.models import OriginServer, ContentProvider
-
 from xosresource import XOSResource
+from services.hpc.models import OriginServer, ContentProvider
 
 class XOSOriginServer(XOSResource):
     provides = "tosca.nodes.OriginServer"
diff --git a/xos/tosca/resources/serviceprovider.py b/xos/tosca/resources/serviceprovider.py
index 2c9a167..063816e 100644
--- a/xos/tosca/resources/serviceprovider.py
+++ b/xos/tosca/resources/serviceprovider.py
@@ -1,13 +1,5 @@
-import os
-import pdb
-import sys
-import tempfile
-sys.path.append("/opt/tosca")
-from translator.toscalib.tosca_template import ToscaTemplate
-
-from services.hpc.models import ServiceProvider, HpcService
-
 from xosresource import XOSResource
+from services.hpc.models import ServiceProvider, HpcService
 
 class XOSServiceProvider(XOSResource):
     provides = "tosca.nodes.ServiceProvider"