diff --git a/InvenTree/company/templates/company/supplier_part_base.html b/InvenTree/company/templates/company/supplier_part_base.html
index f06c26e20e..20aa7cdec5 100644
--- a/InvenTree/company/templates/company/supplier_part_base.html
+++ b/InvenTree/company/templates/company/supplier_part_base.html
@@ -87,17 +87,18 @@ src="{% static 'img/blank_image.png' %}"
             <td>{% trans "SKU" %}</td>
             <td>{{ part.SKU }}</tr>
         </tr>
-        {% if part.manufacturer %}
+        {% if part.manufacturer_part.manufacturer %}
         <tr>
             <td><span class='fas fa-industry'></span></td>
             <td>{% trans "Manufacturer" %}</td>
-            <td><a href="{% url 'company-detail-manufacturer-parts' part.manufacturer.id %}">{{ part.manufacturer.name }}</a></td></tr>
+            <td><a href="{% url 'company-detail-manufacturer-parts' part.manufacturer_part.manufacturer.id %}">{{ part.manufacturer_part.manufacturer.name }}</a></td>
+        </tr>
         {% endif %}
-        {% if part.MPN %}
+        {% if part.manufacturer_part.MPN %}
         <tr>
             <td><span class='fas fa-hashtag'></span></td>
             <td>{% trans "MPN" %}</td>
-            <td>{{ part.MPN }}</td>
+            <td>{{ part.manufacturer_part.MPN }}</td>
         </tr>
         {% endif %}
         {% if part.packaging %}
diff --git a/InvenTree/company/templates/company/supplier_part_manufacturers.html b/InvenTree/company/templates/company/supplier_part_manufacturers.html
deleted file mode 100644
index deef6cdd1d..0000000000
--- a/InvenTree/company/templates/company/supplier_part_manufacturers.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "company/supplier_part_base.html" %}
-{% load static %}
-{% load i18n %}
-{% load inventree_extras %}
-
-{% block menubar %}
-{% include "company/supplier_part_navbar.html" with tab='manufacturers' %}
-{% endblock %}
-
-{% block heading %}
-{% trans "Manufacturer Parts" %}
-{% endblock %}
-
-{% block details %}
-{% setting_object 'PART_ENABLE_MANUFACTURER_PARTS' as manufacturer_parts %}
-
-{% if manufacturer_parts.value == "True" %}
-<table class="table table-striped table-condensed" id='manufacturer-table' data-toolbar='#button-toolbar'>
-</table>
-{% else %}
-<div class='alert alert-block alert-warning'>
-    {% trans "Manufactured parts are disabled. Admin users can enable them in the global settings." %}
-</div>
-{% endif %}
-
-{% endblock %}
-
-{% block js_ready %}
-{{ block.super }}
-
-    loadManufacturerPartTable(
-        "#manufacturer-table",
-        "{% url 'api-manufacturer-part-list' %}",
-        {
-            params: {
-                supplier_part: {{ part.id }},
-                part_detail: true,
-                manufacturer_detail: true,
-            },
-        }
-    );
-
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/company/templates/company/supplier_part_navbar.html b/InvenTree/company/templates/company/supplier_part_navbar.html
index 33b1a02f34..09c3bc0443 100644
--- a/InvenTree/company/templates/company/supplier_part_navbar.html
+++ b/InvenTree/company/templates/company/supplier_part_navbar.html
@@ -9,16 +9,6 @@
         </a>
     </li>
 
-    {% setting_object 'PART_ENABLE_MANUFACTURER_PARTS' as manufacturer_parts %}
-    {% if manufacturer_parts.value == "True" %}
-    <li class='list-group-item {% if tab == "manufacturers" %}active{% endif %}' title='{% trans "Manufacturer Parts" %}'>
-        <a href='{% url "supplier-part-manufacturers" part.id %}'>
-            <span class='fas fa-industry'></span>
-            {% trans "Manufacturers" %}
-        </a>
-    </li>
-    {% endif %}
-
     <li class='list-group-item {% if tab == "stock" %}active{% endif %}' title='{% trans "Supplier Part Stock" %}'>
         <a href='{% url "supplier-part-stock" part.id %}'>
             <span class='fas fa-boxes'></span>