diff --git a/InvenTree/build/templates/build/create.html b/InvenTree/build/templates/build/create.html
deleted file mode 100644
index b53fc58fec..0000000000
--- a/InvenTree/build/templates/build/create.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Create a new build
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/build/templates/build/update.html b/InvenTree/build/templates/build/update.html
deleted file mode 100644
index c5691d145f..0000000000
--- a/InvenTree/build/templates/build/update.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Edit build details
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/build/views.py b/InvenTree/build/views.py
index 0344de81ed..f3f7bd79f3 100644
--- a/InvenTree/build/views.py
+++ b/InvenTree/build/views.py
@@ -70,7 +70,6 @@ class BuildAllocate(DetailView):
 
 class BuildCreate(AjaxCreateView):
     model = Build
-    template_name = 'build/create.html'
     context_object_name = 'build'
     form_class = EditBuildForm
     ajax_form_title = 'Start new Build'
@@ -96,7 +95,6 @@ class BuildUpdate(AjaxUpdateView):
     model = Build
     form_class = EditBuildForm
     context_object_name = 'build'
-    template_name = 'build/update.html'
     ajax_form_title = 'Edit Build Details'
     ajax_template_name = 'modal_form.html'
 
diff --git a/InvenTree/company/templates/company/create.html b/InvenTree/company/templates/company/create.html
deleted file mode 100644
index b01ab9e9f9..0000000000
--- a/InvenTree/company/templates/company/create.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Create a new supplier
-{% endblock %}
diff --git a/InvenTree/company/templates/company/edit.html b/InvenTree/company/templates/company/edit.html
deleted file mode 100644
index e043fdb211..0000000000
--- a/InvenTree/company/templates/company/edit.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Edit details for company '{{ company.name }}'
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/company/templates/company/order_create.html b/InvenTree/company/templates/company/order_create.html
deleted file mode 100644
index d401662ea3..0000000000
--- a/InvenTree/company/templates/company/order_create.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Create a new supplier purchase order
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/company/templates/company/partcreate.html b/InvenTree/company/templates/company/partcreate.html
deleted file mode 100644
index bee5cbefc8..0000000000
--- a/InvenTree/company/templates/company/partcreate.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Create a new supplier part
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/company/templates/company/partedit.html b/InvenTree/company/templates/company/partedit.html
deleted file mode 100644
index f4c78cd39d..0000000000
--- a/InvenTree/company/templates/company/partedit.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Edit supplier part '{{ part.SKU }}'
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/company/views.py b/InvenTree/company/views.py
index 9042578baf..5a80e5ea15 100644
--- a/InvenTree/company/views.py
+++ b/InvenTree/company/views.py
@@ -51,7 +51,6 @@ class CompanyImage(AjaxUpdateView):
 class CompanyEdit(AjaxUpdateView):
     model = Company
     form_class = EditCompanyForm
-    template_name = 'company/edit.html'
     context_object_name = 'company'
     ajax_template_name = 'modal_form.html'
     ajax_form_title = 'Edit Company'
@@ -66,7 +65,6 @@ class CompanyCreate(AjaxCreateView):
     model = Company
     context_object_name = 'company'
     form_class = EditCompanyForm
-    template_name = "company/create.html"
     ajax_template_name = 'modal_form.html'
     ajax_form_title = "Create new Company"
 
@@ -79,7 +77,7 @@ class CompanyCreate(AjaxCreateView):
 class CompanyDelete(AjaxDeleteView):
     model = Company
     success_url = '/company/'
-    template_name = 'company/delete.html'
+    ajax_template_name = 'company/delete.html'
     ajax_form_title = 'Delete Company'
 
     def get_data(self):
diff --git a/InvenTree/part/templates/part/bom-create.html b/InvenTree/part/templates/part/bom-create.html
deleted file mode 100644
index 7db3161c84..0000000000
--- a/InvenTree/part/templates/part/bom-create.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends 'create_edit_obj.html' %}
-
-{% block obj_title %}
-Create a new BOM item
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/bom-edit.html b/InvenTree/part/templates/part/bom-edit.html
deleted file mode 100644
index 91a503004c..0000000000
--- a/InvenTree/part/templates/part/bom-edit.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends 'create_edit_obj.html' %}
-
-{% block obj_title %}
-Edit details for BOM item
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/category_edit.html b/InvenTree/part/templates/part/category_edit.html
deleted file mode 100644
index fb71df0161..0000000000
--- a/InvenTree/part/templates/part/category_edit.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Edit category '{{ category.name }}'
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/category_new.html b/InvenTree/part/templates/part/category_new.html
deleted file mode 100644
index 807352cd58..0000000000
--- a/InvenTree/part/templates/part/category_new.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Create a new part category{% if category %} in category '{{ category.name }}'{% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/create.html b/InvenTree/part/templates/part/create.html
deleted file mode 100644
index 1b6fc8ae89..0000000000
--- a/InvenTree/part/templates/part/create.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Create a new part{% if category %} in category '{{ category.name }}'{% endif %}
-{% endblock %}
diff --git a/InvenTree/part/templates/part/delete.html b/InvenTree/part/templates/part/delete.html
deleted file mode 100644
index 9e38b07be4..0000000000
--- a/InvenTree/part/templates/part/delete.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "delete_obj.html" %}
-
-
-{% block del_title %}
-    Are you sure you want to delete part '{{ part.name }}'?
-{% endblock %}
-
-{% block del_body %}
-
-    {$ include 'part/partial_delete' with part=part %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/edit.html b/InvenTree/part/templates/part/edit.html
deleted file mode 100644
index 63917e7846..0000000000
--- a/InvenTree/part/templates/part/edit.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Edit details for part '{{ part.name }}'
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/item_create.html b/InvenTree/stock/templates/stock/item_create.html
deleted file mode 100644
index 862acc859b..0000000000
--- a/InvenTree/stock/templates/stock/item_create.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Create a new stock item
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/item_edit.html b/InvenTree/stock/templates/stock/item_edit.html
deleted file mode 100644
index 5f0de213b9..0000000000
--- a/InvenTree/stock/templates/stock/item_edit.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Edit stock item for part '{{ item.part.name }}'
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/location_create.html b/InvenTree/stock/templates/stock/location_create.html
deleted file mode 100644
index c79e09ae70..0000000000
--- a/InvenTree/stock/templates/stock/location_create.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Create a new stock location
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/location_edit.html b/InvenTree/stock/templates/stock/location_edit.html
deleted file mode 100644
index d2fbdbb84e..0000000000
--- a/InvenTree/stock/templates/stock/location_edit.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "create_edit_obj.html" %}
-
-{% block obj_title %}
-Edit stock location '{{ location.name }}'
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py
index 08b59857a1..207b2e698a 100644
--- a/InvenTree/stock/views.py
+++ b/InvenTree/stock/views.py
@@ -68,7 +68,6 @@ class StockLocationEdit(AjaxUpdateView):
 
     model = StockLocation
     form_class = EditStockLocationForm
-    template_name = 'stock/location_edit.html'
     context_object_name = 'location'
     ajax_template_name = 'modal_form.html'
     ajax_form_title = 'Edit Stock Location'
@@ -81,7 +80,6 @@ class StockItemEdit(AjaxUpdateView):
 
     model = StockItem
     form_class = EditStockItemForm
-    # template_name = 'stock/item_edit.html'
     context_object_name = 'item'
     ajax_template_name = 'modal_form.html'
     ajax_form_title = 'Edit Stock Item'
@@ -95,7 +93,6 @@ class StockLocationCreate(AjaxCreateView):
 
     model = StockLocation
     form_class = EditStockLocationForm
-    template_name = 'stock/location_create.html'
     context_object_name = 'location'
     ajax_template_name = 'modal_form.html'
     ajax_form_title = 'Create new Stock Location'
@@ -121,7 +118,6 @@ class StockItemCreate(AjaxCreateView):
 
     model = StockItem
     form_class = CreateStockItemForm
-    template_name = 'stock/item_create.html'
     context_object_name = 'item'
     ajax_template_name = 'modal_form.html'
     ajax_form_title = 'Create new Stock Item'
diff --git a/InvenTree/templates/create_edit_obj.html b/InvenTree/templates/create_edit_obj.html
deleted file mode 100644
index cc18a791b3..0000000000
--- a/InvenTree/templates/create_edit_obj.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "base.html" %}
-
-{% load static %}
-
-{% block content %}
-
-<div class='panel panel-primary'>
-    <div class='panel-heading'>
-{% block obj_title %}
-    Object title goes here
-{% endblock %}
-    </div>
-    <div class='panel-body'>
-{% load crispy_forms_tags %}
-{% crispy form %}
-    </div>
-</div>
-
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/delete_obj.html b/InvenTree/templates/delete_obj.html
deleted file mode 100644
index 3cf123330d..0000000000
--- a/InvenTree/templates/delete_obj.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-
-<div class="panel panel-danger">
-<div class="panel-heading">
-{% block del_title %}
-Deletion title goes here
-{% endblock %}
-</div>
-<div class="panel-body">
-    <p><b>This is a permanent action and cannot be undone.</b></p>
-
-{% block del_body %}
-{% endblock %}
-
-<form action="" method="post">{% csrf_token %}
-  <input type="submit" name='confirm' value="Confirm" />
-  <input type="submit" name="cancel" value="Cancel" />
-</form>
-
-</div>
-</div>
-
-{% endblock %}
\ No newline at end of file