diff --git a/umbraco.MacroEngines.Juno/RazorCore/BaseContext.cs b/umbraco.MacroEngines.Juno/RazorCore/BaseContext.cs
index 8c1a2290c0..b9500fc3a5 100644
--- a/umbraco.MacroEngines.Juno/RazorCore/BaseContext.cs
+++ b/umbraco.MacroEngines.Juno/RazorCore/BaseContext.cs
@@ -2,6 +2,7 @@
 using System.Web.WebPages;
 using umbraco.cms.businesslogic.macro;
 using umbraco.interfaces;
+using umbraco.MacroEngines.Library;
 
 namespace umbraco.MacroEngines
 {
@@ -57,11 +58,11 @@ namespace umbraco.MacroEngines
             return CultureDictionary[key];
         }
 
-        public IRazorLibrary Library
+        public RazorLibraryCore Library
         {
             get
             {
-                return new RazorLibraryImpl(_node);
+                return new RazorLibraryCore(this._node);
             }
         }
 
diff --git a/umbraco.MacroEngines.Juno/RazorCore/IRazorLibrary.cs b/umbraco.MacroEngines.Juno/RazorCore/IRazorLibrary.cs
deleted file mode 100644
index 04b74e6d3a..0000000000
--- a/umbraco.MacroEngines.Juno/RazorCore/IRazorLibrary.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using umbraco.interfaces;
-
-namespace umbraco.MacroEngines
-{
-    public interface IRazorLibrary
-    {
-        INode Node { get; }
-    }
-}
diff --git a/umbraco.MacroEngines.Juno/RazorCore/RazorLibraryImpl.cs b/umbraco.MacroEngines.Juno/RazorCore/RazorLibraryImpl.cs
deleted file mode 100644
index 402438f3dd..0000000000
--- a/umbraco.MacroEngines.Juno/RazorCore/RazorLibraryImpl.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using umbraco.interfaces;
-
-namespace umbraco.MacroEngines
-{
-    public class RazorLibraryImpl : IRazorLibrary
-    {
-        private readonly INode _node;
-
-        public RazorLibraryImpl(INode node)
-        {
-            _node = node;
-        }
-        public INode Node
-        {
-            get
-            {
-                return _node;
-            }
-        }
-    }
-
-}
diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs
index 7037987c21..31aa7d5410 100644
--- a/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs
@@ -2,14 +2,29 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using umbraco.interfaces;
 
 namespace umbraco.MacroEngines.Library
 {
-    public static class RazorLibraryCore
+    public class RazorLibraryCore
     {
-        //public static string Helper1(this IRazorLibrary library, string defaultParam1 = "")
-        //{
-        //    return defaultParam1;
-        //}
+        private INode _node;
+        public INode Node
+        {
+            get { return _node; }
+        }
+        public RazorLibraryCore(INode node)
+        {
+            this._node = node;
+        }
+
+
+
+        public string Helper1(string defaultParam1 = "")
+        {
+            return defaultParam1;
+        }
+
+
     }
 }
diff --git a/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj b/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
index 242ce052ca..90e88e6453 100644
--- a/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
+++ b/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
@@ -61,8 +61,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="RazorCore\BaseContext.cs" />
-    <Compile Include="RazorCore\IRazorLibrary.cs" />
-    <Compile Include="RazorCore\RazorLibraryImpl.cs" />
     <Compile Include="RazorDynamicNode\DynamicMediaList.cs" />
     <Compile Include="RazorDynamicNode\DynamicNodeList.cs" />
     <Compile Include="RazorDynamicNode\RazorLibraryCore.cs" />
diff --git a/umbraco/presentation/web.STANDARD.config b/umbraco/presentation/web.STANDARD.config
index 9a046484db..6bccc8deed 100644
--- a/umbraco/presentation/web.STANDARD.config
+++ b/umbraco/presentation/web.STANDARD.config
@@ -264,7 +264,6 @@
                 <add namespace="Microsoft.Web.Helpers" />
                 <add namespace="umbraco" />
                 <add namespace="Examine" />
-                <add namespace="umbraco.MacroEngines.Library"/>
             </namespaces>
         </pages>
     </system.web.webPages.razor>