diff --git a/planetstack/hpc/admin.py b/planetstack/hpc/admin.py
index 2a6d518..9e6c84e 100644
--- a/planetstack/hpc/admin.py
+++ b/planetstack/hpc/admin.py
@@ -10,7 +10,7 @@
 from django.utils import timezone
 from django.contrib.contenttypes import generic
 from suit.widgets import LinkedSelect
-from core.admin import SingletonAdmin,SliceInline,ServiceAttrAsTabInline, SliceROInline,ServiceAttrAsTabROInline, ReadOnlyAwareAdmin, PlStackTabularInline, ReadOnlyTabularInline
+from core.admin import SingletonAdmin,SliceInline,ServiceAttrAsTabInline, ReadOnlyAwareAdmin, PlStackTabularInline
 
 class HpcServiceAdmin(SingletonAdmin):
     model = HpcService
@@ -21,7 +21,6 @@
     inlines = [SliceInline,ServiceAttrAsTabInline]
 
     user_readonly_fields = ["name", "enabled", "versionNumber", "description"]
-    user_readonly_inlines = [SliceROInline, ServiceAttrAsTabROInline]
 
     suit_form_tabs =(('general', 'HPC Service Details'),
         ('slices','Slices'),
@@ -35,13 +34,6 @@
     fields = ('cdn_prefix_id', 'prefix', 'defaultOriginServer', 'enabled')
     readonly_fields = ('cdn_prefix_id',)
 
-class CDNPrefixROInline(ReadOnlyTabularInline):
-    model = CDNPrefix
-    extra = 0
-    suit_classes = 'suit-tab suit-tab-prefixes'
-    fields = ('cdn_prefix_id', 'prefix', 'defaultOriginServer', 'enabled')
-    readonly_fields = ('cdn_prefix_id',)
-
 class ContentProviderInline(PlStackTabularInline):
     model = ContentProvider
     extra = 0
@@ -49,11 +41,6 @@
     fields = ('content_provider_id', 'name', 'enabled')
     readonly_fields = ('content_provider_id',)
 
-class ContentProviderROInline(ReadOnlyTabularInline):
-    model = ContentProvider
-    extra = 0
-    suit_classes = 'suit-tab suit-tab-cps'
-
 class OriginServerAdmin(ReadOnlyAwareAdmin):
     list_display = ('url','protocol','redirects','contentProvider','authenticated','enabled' )
 
@@ -75,7 +62,6 @@
     inlines = [CDNPrefixInline]
 
     user_readonly_fields = ('name','description','enabled','serviceProvider','users')
-    user_readonly_inlines = [CDNPrefixROInline]
 
     suit_form_tabs = (('general','Details'),('prefixes','CDN Prefixes'))
 
@@ -86,7 +72,6 @@
 #, ('Content Providers', {'fields':['contentProviders'],'classes':['suit-tab suit-tab-cps']})]
 
     user_readonly_fields = ('name', 'description', 'enabled')
-    user_readonly_inlines = [ContentProviderROInline]
 
     suit_form_tabs = (('general','Details'),('cps','Content Providers'))
     inlines = [ContentProviderInline]