diff --git a/aspnet35.build b/aspnet35.build
index 4b9e7765e3..1b02d6a543 100644
--- a/aspnet35.build
+++ b/aspnet35.build
@@ -20,16 +20,6 @@
     <property name="win.dir" value="c:\WINDOWS" />
     <property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
 
-    <!-- Sandcastle Directories -->
-    <property name="sandcastle.dir" value="c:\Program Files\Sandcastle" />
-    <property name="sandcastle.workingdir" value="${root.dir}\docs\SandcastleWorkingDir" />
-    <property name="sandcastle.output.dir" value="${sandcastle.workingdir}\Output" />
-
-    <!-- Sandcastle -->
-    <property name="sandcastle.mrefbuilder"  value="${sandcastle.dir}\productiontools\mrefbuilder.exe" />
-    <property name="sandcastle.buildassembler" value="${sandcastle.dir}\productiontools\buildassembler.exe" />
-    <property name="sandcastle.xsltransform" value="${sandcastle.dir}\productiontools\xsltransform.exe" />
-
     <!-- YUI -->
     <property name="YUICompressor.dir" value="D:\inetpub\wwwroot\ccnet\buildTools\YUI" />
 
@@ -41,7 +31,6 @@
                 <include name="**/*" />
             </fileset>
         </attrib>
-
         
         <exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
             <arg value="${root.dir}\umbraco.sln" />
@@ -53,7 +42,6 @@
         <exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
     </target>
 
-
     <!-- Directories and files -->
     <target name="directories" depends="build">
 
@@ -65,6 +53,13 @@
             </fileset>
         </copy>
 
+        <!-- asp.net 3.5 DLR dlls -->
+        <copy todir="${build.dir}\bin">
+            <fileset basedir="${dlls.dir}\asp.net 3.5 Assemblies">
+                <include name="*.dll" />
+            </fileset>
+        </copy>
+
         <!--standard web.config-->
         <copy file="${root.dir}\aspnet35.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
 
@@ -130,7 +125,8 @@
                 <include name="${build.dir}/**/*.compiled" />
                 <include name="${build.dir}/**/*.resx" />
                 <include name="${build.dir}/**/*.user" />
-                
+                <include name="${build.dir}/**/*.pdb" />
+
                 <include name="${build.dir}/PrecompiledApp.config" />
                 <include name="${build.dir}/web.config.template" />
                 <include name="${build.dir}/*.xslt" />
diff --git a/aspnet35.config b/aspnet35.config
index 63c961cf58..b22aa83ccc 100644
--- a/aspnet35.config
+++ b/aspnet35.config
@@ -31,6 +31,7 @@
   <clientDependency configSource="config\ClientDependency.config" />
   <Examine configSource="config\ExamineSettings.config" />
   <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
+
   <appSettings>
     <add key="umbracoDbDSN" value="server=.\SQLEXPRESS;database=DATABASE;user id=USER;password=PASS" />
     <add key="umbracoConfigurationStatus" value="" />
diff --git a/foreign dlls/IronPython.dll b/foreign dlls/IronPython.dll
deleted file mode 100644
index b82653ff0f..0000000000
Binary files a/foreign dlls/IronPython.dll and /dev/null differ
diff --git a/foreign dlls/IronRuby.dll b/foreign dlls/IronRuby.dll
deleted file mode 100644
index fcf40070f9..0000000000
Binary files a/foreign dlls/IronRuby.dll and /dev/null differ
diff --git a/foreign dlls/Microsoft.Scripting.Core.dll b/foreign dlls/Microsoft.Scripting.Core.dll
deleted file mode 100644
index 8418067d6a..0000000000
Binary files a/foreign dlls/Microsoft.Scripting.Core.dll and /dev/null differ
diff --git a/foreign dlls/Microsoft.Scripting.ExtensionAttribute.dll b/foreign dlls/Microsoft.Scripting.ExtensionAttribute.dll
deleted file mode 100644
index 761780edd8..0000000000
Binary files a/foreign dlls/Microsoft.Scripting.ExtensionAttribute.dll and /dev/null differ
diff --git a/foreign dlls/Microsoft.Scripting.dll b/foreign dlls/Microsoft.Scripting.dll
deleted file mode 100644
index ccc176f867..0000000000
Binary files a/foreign dlls/Microsoft.Scripting.dll and /dev/null differ
diff --git a/umbraco.sln b/umbraco.sln
index 154f12abc5..b69adddae4 100644
--- a/umbraco.sln
+++ b/umbraco.sln
@@ -2,6 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0242771-6DE6-4E03-BD3A-7B79BA79105B}"
 	ProjectSection(SolutionItems) = preProject
+		aspnet35.build = aspnet35.build
 		build.xml = build.xml
 		default.build = default.build
 		INDIGO64.testrunconfig = INDIGO64.testrunconfig
@@ -65,14 +66,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLLs", "DLLs", "{F06D18F6-C
 		foreign dlls\ICSharpCode.SharpZipLib.dll = foreign dlls\ICSharpCode.SharpZipLib.dll
 		foreign dlls\IronMath.dll = foreign dlls\IronMath.dll
 		IronPython License.Rtf = IronPython License.Rtf
-		foreign dlls\IronPython.dll = foreign dlls\IronPython.dll
-		foreign dlls\IronRuby.dll = foreign dlls\IronRuby.dll
 		License.txt = License.txt
 		foreign dlls\Lucene.Net.dll = foreign dlls\Lucene.Net.dll
 		foreign dlls\Microsoft.ApplicationBlocks.Data.dll = foreign dlls\Microsoft.ApplicationBlocks.Data.dll
-		foreign dlls\Microsoft.Scripting.Core.dll = foreign dlls\Microsoft.Scripting.Core.dll
-		foreign dlls\Microsoft.Scripting.dll = foreign dlls\Microsoft.Scripting.dll
-		foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll = foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll
 		foreign dlls\MySql.Data.dll = foreign dlls\MySql.Data.dll
 		foreign dlls\TidyNet.dll = foreign dlls\TidyNet.dll
 		foreign dlls\UmbracoExamine.dll = foreign dlls\UmbracoExamine.dll