diff --git a/src/Orchard.Tests.Modules/Packaging/PackageBuilderTests.cs b/src/Orchard.Tests.Modules/Packaging/PackageBuilderTests.cs
index de90cabcf..796068f29 100644
--- a/src/Orchard.Tests.Modules/Packaging/PackageBuilderTests.cs
+++ b/src/Orchard.Tests.Modules/Packaging/PackageBuilderTests.cs
@@ -43,7 +43,7 @@ namespace Orchard.Tests.Modules.Packaging {
 
             var package = Package.Open(stream);
             Assert.That(package, Is.Not.Null);
-            Assert.That(package.PackageProperties.Identifier, Is.EqualTo(PackagingSourceManager.ModulesPrefix + PackageIdentifier));
+            Assert.That(package.PackageProperties.Identifier, Is.EqualTo(PackageBuilder.BuildPackageId(PackageIdentifier, DefaultExtensionTypes.Module)));
         }
 
         [Test]
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml
index 8f83675ce..17d5ed2ea 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml
@@ -1,8 +1,11 @@
 @model Orchard.ContentTypes.ViewModels.EditTypePartViewModel
+@using Orchard.Core.Contents.Settings;
     <fieldset class="manage-part" itemscope="itemscope" itemid="@Model.PartDefinition.Name" itemtype="http://orchardproject.net/data/ContentTypePart">
         <h3 itemprop="Name">@Model.PartDefinition.DisplayName</h3>
         <div class="manage">
-            @Html.ActionLink(T("Remove").Text, "RemovePartFrom", new { area = "Orchard.ContentTypes", id = Model.Type.Name, Model.PartDefinition.Name }, new { itemprop = "RemoveUrl UnsafeUrl" }) @* <- some experimentation *@
+            @if (Model.PartDefinition.Settings.GetModel<ContentPartSettings>().Attachable) {
+                @Html.ActionLink(T("Remove").Text, "RemovePartFrom", new { area = "Orchard.ContentTypes", id = Model.Type.Name, Model.PartDefinition.Name }, new { itemprop = "RemoveUrl UnsafeUrl" });
+            }
         </div>
         <div class="details">@Html.EditorFor(m => m.PartDefinition.Fields, "TypePartFields", "PartDefinition")
         @if (Model.Templates.Any()) {
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs
index da55c9304..d4efda838 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs
@@ -5,6 +5,7 @@ using System.Web.Hosting;
 using System.Web.Mvc;
 using NuGet;
 using Orchard.Environment.Extensions;
+using Orchard.Environment.Extensions.Models;
 using Orchard.FileSystems.AppData;
 using Orchard.Localization;
 using Orchard.Mvc.Extensions;
@@ -14,6 +15,7 @@ using Orchard.Themes;
 using Orchard.UI.Admin;
 using Orchard.UI.Notify;
 using IPackageManager = Orchard.Packaging.Services.IPackageManager;
+using PackageBuilder = Orchard.Packaging.Services.PackageBuilder;
 
 namespace Orchard.Packaging.Controllers {
     [OrchardFeature("PackagingServices")]
@@ -60,7 +62,7 @@ namespace Orchard.Packaging.Controllers {
             if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to remove themes")))
                 return new HttpUnauthorizedResult();
 
-            return UninstallPackage(PackagingSourceManager.ThemesPrefix + themeId, returnUrl, retryUrl);
+            return UninstallPackage(PackageBuilder.BuildPackageId(themeId, DefaultExtensionTypes.Theme), returnUrl, retryUrl);
         }
 
         public ActionResult AddModule(string returnUrl) {
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs
index b7390a967..6e1b8c13a 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using NuGet;
 using Orchard.Data;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Models;