diff --git a/CHANGELOG.md b/CHANGELOG.md
index 092fc7ab5..fdee746d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ v2.4.5 (FUTURE)
 
 ## Enhancements
 
+* [#2392](https://github.com/digitalocean/netbox/issues/2392) - Implemented local context data for devices and virtual machines
 * [#2402](https://github.com/digitalocean/netbox/issues/2402) - Order and format JSON data in form fields
 * [#2432](https://github.com/digitalocean/netbox/issues/2432) - Link remote interface connections to the Interface view
 
diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index 19c75bdb9..700741a15 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -10,7 +10,7 @@ from django.contrib.postgres.fields import ArrayField, JSONField
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.db.models import Count, Q, ObjectDoesNotExist
+from django.db.models import Count, Q
 from django.urls import reverse
 from django.utils.encoding import python_2_unicode_compatible
 from mptt.models import MPTTModel, TreeForeignKey
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 16c90c1cd..119c9ee4f 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -2,7 +2,6 @@ from __future__ import unicode_literals
 
 from django.conf import settings
 from django.contrib.contenttypes.fields import GenericRelation
-from django.contrib.postgres.fields import JSONField
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.urls import reverse