Cleaned up email system