diff --git a/lib/claysharp/ClaySharp.dll b/lib/claysharp/ClaySharp.dll
index 5668f027b..f2db449a6 100644
Binary files a/lib/claysharp/ClaySharp.dll and b/lib/claysharp/ClaySharp.dll differ
diff --git a/src/Orchard/ContentManagement/DefaultContentDisplay.cs b/src/Orchard/ContentManagement/DefaultContentDisplay.cs
index 554e1e2a2..62a5b5972 100644
--- a/src/Orchard/ContentManagement/DefaultContentDisplay.cs
+++ b/src/Orchard/ContentManagement/DefaultContentDisplay.cs
@@ -1,16 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Web.Routing;
-using ClaySharp;
 using ClaySharp.Implementation;
-using Microsoft.CSharp.RuntimeBinder;
 using Orchard.ContentManagement.Handlers;
 using Orchard.DisplayManagement;
 using Orchard.DisplayManagement.Descriptors;
 using Orchard.Logging;
-using Orchard.Mvc;
 using Orchard.Themes;
 using Orchard.UI.Zones;
 
@@ -19,8 +14,6 @@ namespace Orchard.ContentManagement {
         private readonly Lazy<IEnumerable<IContentHandler>> _handlers;
         private readonly IShapeFactory _shapeFactory;
         private readonly IShapeTableManager _shapeTableManager;
-        private readonly IWorkContextAccessor _workContextAccessor;
-        private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly Lazy<IThemeService> _themeService;
         private readonly RequestContext _requestContext;
 
@@ -28,15 +21,11 @@ namespace Orchard.ContentManagement {
             Lazy<IEnumerable<IContentHandler>> handlers,
             IShapeFactory shapeFactory,
             IShapeTableManager shapeTableManager,
-            IWorkContextAccessor workContextAccessor,
-            IHttpContextAccessor httpContextAccessor,
             Lazy<IThemeService> themeService,
             RequestContext requestContext) {
             _handlers = handlers;
             _shapeFactory = shapeFactory;
             _shapeTableManager = shapeTableManager;
-            _workContextAccessor = workContextAccessor;
-            _httpContextAccessor = httpContextAccessor;
             _themeService = themeService;
             _requestContext = requestContext;
             Logger = NullLogger.Instance;
@@ -44,14 +33,6 @@ namespace Orchard.ContentManagement {
 
         public ILogger Logger { get; set; }
 
-        static readonly CallSiteCollection _shapeHelperCalls = new CallSiteCollection(shapeTypeName => Binder.InvokeMember(
-            CSharpBinderFlags.None,
-            shapeTypeName,
-            Enumerable.Empty<Type>(),
-            null,
-            new[] { CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) }));
-
-
         public dynamic BuildDisplay(IContent content, string displayType) {
             var contentTypeDefinition = content.ContentItem.TypeDefinition;
             string stereotype;