diff --git a/InvenTree/build/forms.py b/InvenTree/build/forms.py
index efec7c3aba..8eaadc9a5f 100644
--- a/InvenTree/build/forms.py
+++ b/InvenTree/build/forms.py
@@ -15,12 +15,6 @@ class EditBuildForm(forms.ModelForm):
 
         self.helper.form_tag = False
 
-        initial = kwargs.get('initial', {})
-
-        for field in ['part']:
-            if field in initial:
-                self.fields['field'].disabled = True
-
     class Meta:
         model = Build
         fields = [
diff --git a/InvenTree/part/forms.py b/InvenTree/part/forms.py
index 6661081aa9..00d82ddd60 100644
--- a/InvenTree/part/forms.py
+++ b/InvenTree/part/forms.py
@@ -13,11 +13,6 @@ class EditPartForm(forms.ModelForm):
 
         self.helper.form_tag = False
 
-        initial = kwargs.get('initial', {})
-
-        if 'category' in initial:
-            self.fields['category'].disabled = True
-
     class Meta:
         model = Part
         fields = [
@@ -45,11 +40,6 @@ class EditCategoryForm(forms.ModelForm):
 
         self.helper.form_tag = False
 
-        initial = kwargs.get('initial', {})
-
-        if 'category' in initial:
-            self.fields['parent'].disabled = True
-
     class Meta:
         model = PartCategory
         fields = [
@@ -69,12 +59,6 @@ class EditBomItemForm(forms.ModelForm):
 
         self.helper.form_tag = False
 
-        initial = kwargs.get('initial', {})
-
-        for field in ['part', 'sub_part']:
-            if field in initial:
-                self.fields[field].disabled = True
-
     class Meta:
         model = BomItem
         fields = [
@@ -91,12 +75,6 @@ class EditSupplierPartForm(forms.ModelForm):
 
             self.helper.form_tag = False
 
-            initial = kwargs.get('initial', {})
-
-            for field in ['supplier', 'part']:
-                if field in initial:
-                    self.fields[field].disabled = True
-
         class Meta:
             model = SupplierPart
             fields = [
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index f59fb2c50c..33d2ec573f 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -98,18 +98,11 @@ $(document).ready(function () {
         launchModalForm("#modal-form", "{% url 'part-edit' part.id %}");
     });
 
-    {% if part.category %}
-    var partRedirect = "{% url 'category-detail' part.category.id %}";
-    {% else %}
-    var partRedirect = "{% url 'part-index' %}";
-    {% endif %}
-
     $('#delete-part').click(function() {
         launchDeleteForm("#modal-delete",
                          "{% url 'part-delete' part.id %}",
-                         {
-                             redirect: partRedirect
-                         });
+                         {redirect: "{% url 'part-index' %}"}
+        );
     });
 });
 </script>
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index e5b0a8af48..ee28b15c1b 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -239,8 +239,12 @@ class SupplierPartCreate(AjaxCreateView):
 
         if supplier_id:
             initials['supplier'] = get_object_or_404(Company, pk=supplier_id)
+            # TODO
+            # self.fields['supplier'].disabled = True
         if part_id:
             initials['part'] = get_object_or_404(Part, pk=part_id)
+            # TODO
+            # self.fields['part'].disabled = True
 
         return initials
 
diff --git a/InvenTree/stock/forms.py b/InvenTree/stock/forms.py
index 795963af80..1b49b8e223 100644
--- a/InvenTree/stock/forms.py
+++ b/InvenTree/stock/forms.py
@@ -15,11 +15,6 @@ class EditStockLocationForm(forms.ModelForm):
 
         self.helper.form_tag = False
 
-        initial = kwargs.get('initial', {})
-
-        if 'location' in initial:
-            self.fields['parent'].disabled = True
-
     class Meta:
         model = StockLocation
         fields = [
@@ -37,12 +32,6 @@ class EditStockItemForm(forms.ModelForm):
 
         self.helper.form_tag = False
 
-        initial = kwargs.get('initial', {})
-
-        for field in ['part', 'location']:
-            if field in initial:
-                self.fields[field].disabled = True
-
     class Meta:
         model = StockItem
         fields = [