diff --git a/doc/source/conf.py b/doc/source/conf.py
index ccdae6fb..64ecfa20 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 2801ad4f..16024c7f 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/setup.cfg b/setup.cfg
index c1d7ef7b..894aae50 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@ description-file =
     README.rst
 author = OpenStack
 author-email = openstack-dev@lists.openstack.org
-home-page = https://wiki.openstack.org/wiki/Zun
+home-page = https://docs.openstack.org/developer/zun/
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -16,7 +16,6 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
 
 [files]
diff --git a/tox.ini b/tox.ini
index 50a300ef..0820b65f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py35,py34,py27,pypy,pep8
+envlist = py35,py27,pypy,pep8
 skipsdist = True
 
 [testenv]
diff --git a/zunclient/__init__.py b/zunclient/__init__.py
index 3778ba30..9fe5c6d9 100644
--- a/zunclient/__init__.py
+++ b/zunclient/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
diff --git a/zunclient/common/base.py b/zunclient/common/base.py
index cc53685e..52c9d325 100644
--- a/zunclient/common/base.py
+++ b/zunclient/common/base.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2012 OpenStack LLC.
 # All Rights Reserved.
diff --git a/zunclient/common/httpclient.py b/zunclient/common/httpclient.py
index 25a6c3dc..cb6d24cc 100644
--- a/zunclient/common/httpclient.py
+++ b/zunclient/common/httpclient.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2012 OpenStack LLC.
 # All Rights Reserved.
diff --git a/zunclient/common/utils.py b/zunclient/common/utils.py
index 860ce9ca..15d92817 100644
--- a/zunclient/common/utils.py
+++ b/zunclient/common/utils.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2012 OpenStack LLC.
 # All Rights Reserved.
diff --git a/zunclient/exceptions.py b/zunclient/exceptions.py
index ef08bfff..2b1aa9b2 100644
--- a/zunclient/exceptions.py
+++ b/zunclient/exceptions.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
diff --git a/zunclient/tests/unit/base.py b/zunclient/tests/unit/base.py
index 0b5b1f44..547ac58b 100644
--- a/zunclient/tests/unit/base.py
+++ b/zunclient/tests/unit/base.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Copyright 2010-2011 OpenStack Foundation
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
diff --git a/zunclient/tests/unit/common/test_utils.py b/zunclient/tests/unit/common/test_utils.py
index e2c93925..46234521 100644
--- a/zunclient/tests/unit/common/test_utils.py
+++ b/zunclient/tests/unit/common/test_utils.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 OpenStack LLC.
 # All Rights Reserved.