diff --git a/ietf/message/admin.py b/ietf/message/admin.py
index 5ba741f37..b95a1a180 100644
--- a/ietf/message/admin.py
+++ b/ietf/message/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from ietf.message.models import *
+from ietf.message.models import Message, SendQueue
 
 class MessageAdmin(admin.ModelAdmin):
     list_display = ["subject", "by", "time", "groups"]
diff --git a/ietf/message/models.py b/ietf/message/models.py
index fcecac73e..b0af873f3 100644
--- a/ietf/message/models.py
+++ b/ietf/message/models.py
@@ -2,7 +2,7 @@ from django.db import models
 
 import datetime
 
-from ietf.person.models import Email, Person
+from ietf.person.models import Person
 from ietf.group.models import Group
 from ietf.doc.models import Document
 
diff --git a/ietf/message/tests.py b/ietf/message/tests.py
index bb38a43c8..f1dd36b54 100644
--- a/ietf/message/tests.py
+++ b/ietf/message/tests.py
@@ -1,6 +1,5 @@
 import datetime
 
-from django.conf import settings
 from django.core.urlresolvers import reverse as urlreverse
 
 from ietf.utils.test_utils import TestCase
diff --git a/ietf/message/utils.py b/ietf/message/utils.py
index 9d1e8ffe8..2123da562 100644
--- a/ietf/message/utils.py
+++ b/ietf/message/utils.py
@@ -1,7 +1,5 @@
 import re, datetime, email
 
-from django.conf import settings
-
 from ietf.utils.mail import send_mail_text, send_mail_mime
 from ietf.message.models import Message
 
diff --git a/ietf/message/views.py b/ietf/message/views.py
index b701f7fd6..268b3e161 100644
--- a/ietf/message/views.py
+++ b/ietf/message/views.py
@@ -1,7 +1,6 @@
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 
-from ietf.group.models import Group
 from ietf.message.models import Message