These are no longer necessary in a Python 3-only world. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: Ia3eda6d451b673f3eafba1aa3ecd2e51b7038f1f