Remove unused imports
Rework mail import to avoid circular problems with celery
Merge branch 'celery-trouble'