diff --git a/PKG-INFO b/PKG-INFO
index b1a57cb..08b055f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,23 +1,21 @@
 Metadata-Version: 1.2
 Name: django-macaddress
-Version: 1.5.0
+Version: 1.7.0
 Summary: MAC address model and form fields for Django apps.
 Home-page: http://github.com/tubaman/django-macaddress
 Author: Ryan Nowakowski
 Author-email: tubaman@fattuba.com
-Maintainer: Arun K. R.
+Maintainer: Arun Karunagath
 Maintainer-email: the1.arun@gmail.com
 License: BSD
 Description: django-macaddress
-        ================
+        ==================
         
-        .. image:: https://api.travis-ci.org/django-macaddress/django-macaddress.png?branch=master
+        .. image:: https://travis-ci.org/django-macaddress/django-macaddress.svg?branch=master
            :alt: Build Status
            :target: https://travis-ci.org/django-macaddress/django-macaddress
         .. image:: https://img.shields.io/pypi/v/django-macaddress.svg
            :target: https://crate.io/packages/django-macaddress
-        .. image:: https://img.shields.io/pypi/dm/django-macaddress.svg
-           :target: https://crate.io/packages/django-macaddress
         
         MAC Address model and form fields for Django
         
@@ -127,6 +125,10 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
 Classifier: Topic :: Internet :: WWW/HTTP
diff --git a/README.rst b/README.rst
index 9c1337b..8d109ea 100644
--- a/README.rst
+++ b/README.rst
@@ -1,13 +1,11 @@
 django-macaddress
-================
+==================
 
-.. image:: https://api.travis-ci.org/django-macaddress/django-macaddress.png?branch=master
+.. image:: https://travis-ci.org/django-macaddress/django-macaddress.svg?branch=master
    :alt: Build Status
    :target: https://travis-ci.org/django-macaddress/django-macaddress
 .. image:: https://img.shields.io/pypi/v/django-macaddress.svg
    :target: https://crate.io/packages/django-macaddress
-.. image:: https://img.shields.io/pypi/dm/django-macaddress.svg
-   :target: https://crate.io/packages/django-macaddress
 
 MAC Address model and form fields for Django
 
diff --git a/debian/changelog b/debian/changelog
index 1133fce..7be217b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-django-macaddress (1.5.0-2.1) UNRELEASED; urgency=medium
+django-macaddress (1.7.0-1) UNRELEASED; urgency=medium
 
   [ Emmanuel Arias ]
   * Bump Standards-Version to 4.4.0.
@@ -17,7 +17,7 @@ django-macaddress (1.5.0-2.1) UNRELEASED; urgency=medium
   [ Sandro Tosi ]
   * Use the new Debian Python Team contact name and address
 
- -- Sandro Tosi <morph@debian.org>  Mon, 04 Jan 2021 16:59:23 -0500
+ -- Sandro Tosi <morph@debian.org>  Sun, 28 Mar 2021 11:56:58 -0000
 
 django-macaddress (1.5.0-2) unstable; urgency=medium
 
diff --git a/django_macaddress.egg-info/PKG-INFO b/django_macaddress.egg-info/PKG-INFO
index b1a57cb..08b055f 100644
--- a/django_macaddress.egg-info/PKG-INFO
+++ b/django_macaddress.egg-info/PKG-INFO
@@ -1,23 +1,21 @@
 Metadata-Version: 1.2
 Name: django-macaddress
-Version: 1.5.0
+Version: 1.7.0
 Summary: MAC address model and form fields for Django apps.
 Home-page: http://github.com/tubaman/django-macaddress
 Author: Ryan Nowakowski
 Author-email: tubaman@fattuba.com
-Maintainer: Arun K. R.
+Maintainer: Arun Karunagath
 Maintainer-email: the1.arun@gmail.com
 License: BSD
 Description: django-macaddress
-        ================
+        ==================
         
-        .. image:: https://api.travis-ci.org/django-macaddress/django-macaddress.png?branch=master
+        .. image:: https://travis-ci.org/django-macaddress/django-macaddress.svg?branch=master
            :alt: Build Status
            :target: https://travis-ci.org/django-macaddress/django-macaddress
         .. image:: https://img.shields.io/pypi/v/django-macaddress.svg
            :target: https://crate.io/packages/django-macaddress
-        .. image:: https://img.shields.io/pypi/dm/django-macaddress.svg
-           :target: https://crate.io/packages/django-macaddress
         
         MAC Address model and form fields for Django
         
@@ -127,6 +125,10 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
 Classifier: Topic :: Internet :: WWW/HTTP
diff --git a/macaddress/fields.py b/macaddress/fields.py
index d4f5f6c..bf5928d 100644
--- a/macaddress/fields.py
+++ b/macaddress/fields.py
@@ -63,8 +63,7 @@ class MACAddressField(models.Field):
             return 'BigIntegerField'
         return 'CharField'
 
-    # @todo: remove context parameter when facing out django < 2.0 support
-    def from_db_value(self, value, expression, connection, context=None):
+    def from_db_value(self, value, expression, connection):
         return self.to_python(value)
 
     def to_python(self, value):
@@ -76,8 +75,7 @@ class MACAddressField(models.Field):
         try:
             return EUI(value, version=48, dialect=default_dialect())
         except (TypeError, ValueError, AddrFormatError):
-            raise ValidationError(
-                "This value must be a valid MAC address.")
+            raise ValidationError("This value must be a valid MAC address.")
 
     def formfield(self, **kwargs):
         defaults = {'form_class': MACAddressFormField}
@@ -86,7 +84,7 @@ class MACAddressField(models.Field):
 
     def get_prep_lookup(self, lookup_type, value):
         # data is stored internally as integer so searching as string
-        # yeild 0 result. for example: useful for search in admin.
+        # yield 0 result. for example: useful for search in admin.
         if lookup_type in ('exact', 'iexact', 'icontains', 'icontains'):
             try:
                 return self.get_prep_value(value)
@@ -102,13 +100,3 @@ class MACAddressField(models.Field):
                 return None
         else:
             raise TypeError('Lookup type %r not supported.' % lookup_type)
-
-if django.VERSION < (1, 8):
-    from django.utils.six import add_metaclass
-    MACAddressField = add_metaclass(models.SubfieldBase)(MACAddressField)
-
-try:
-    from south.modelsinspector import add_introspection_rules
-    add_introspection_rules([], ["^macaddress\.fields\.MACAddressField"])
-except ImportError:
-    pass
diff --git a/macaddress/formfields.py b/macaddress/formfields.py
index 955b73c..c623ae8 100644
--- a/macaddress/formfields.py
+++ b/macaddress/formfields.py
@@ -1,11 +1,7 @@
+from django.core.validators import EMPTY_VALUES
 from django.forms import Field
-from django.forms.fields import EMPTY_VALUES
+from django.forms.utils import ValidationError
 from django.utils.translation import ugettext_lazy as _
-#"From Django 1.8: The django.forms.util module has been renamed. Use django.forms.utils instead."
-try:
-    from django.forms.utils import ValidationError
-except ImportError:
-    from django.forms.util import ValidationError
 
 from netaddr import EUI, AddrFormatError
 
diff --git a/setup.py b/setup.py
index c9842cd..8010204 100644
--- a/setup.py
+++ b/setup.py
@@ -1,36 +1,39 @@
 import os
 from setuptools import setup, find_packages
 
-version = "1.5.0"
+version = "1.7.0"
 
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 setup(
-    name = "django-macaddress",
-    version = version,
-    url = 'http://github.com/tubaman/django-macaddress',
-    license = 'BSD',
-    description = "MAC address model and form fields for Django apps.",
-    long_description = read('README.rst'),
-    author = 'Ryan Nowakowski',
-    author_email = 'tubaman@fattuba.com',
-    maintainer = 'Arun K. R.',
-    maintainer_email = 'the1.arun@gmail.com',
-    packages = ['macaddress', 'macaddress.tests'],
-    install_requires = ['netaddr'],
-    tests_require = ['Django'],
+    name="django-macaddress",
+    version=version,
+    url='http://github.com/tubaman/django-macaddress',
+    license='BSD',
+    description="MAC address model and form fields for Django apps.",
+    long_description=read('README.rst'),
+    author='Ryan Nowakowski',
+    author_email='tubaman@fattuba.com',
+    maintainer='Arun Karunagath',
+    maintainer_email='the1.arun@gmail.com',
+    packages=['macaddress', 'macaddress.tests'],
+    install_requires=['netaddr'],
+    tests_require=['Django'],
     test_suite="runtests.runtests",
-
-    classifiers = [
+    classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Framework :: Django',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3 :: Only',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Internet :: WWW/HTTP',
     ]
 )