From 312e9976920b889782f4c3f221a3cbebbfb39094 Mon Sep 17 00:00:00 2001
From: Neil Williams <neil@reddit.com>
Date: Wed, 27 Mar 2013 16:58:13 -0700
Subject: [PATCH] Clean up some imports.

---
 r2/r2/controllers/mediaembed.py | 13 ++++++-------
 r2/r2/templates/ads.html        |  2 --
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/r2/r2/controllers/mediaembed.py b/r2/r2/controllers/mediaembed.py
index 51316b80d..756259435 100644
--- a/r2/r2/controllers/mediaembed.py
+++ b/r2/r2/controllers/mediaembed.py
@@ -20,15 +20,14 @@
 # Inc. All Rights Reserved.
 ###############################################################################
 
-from reddit_base import MinimalController
-
-from r2.lib.scraper import get_media_embed
-from r2.lib.pages import MediaEmbedBody
-from r2.lib.validator import *
-
-from pylons import request
+from pylons import request, g
 from pylons.controllers.util import abort
 
+from r2.controllers.reddit_base import MinimalController
+from r2.lib.pages import MediaEmbedBody
+from r2.lib.scraper import get_media_embed
+from r2.lib.validator import validate, VLink
+
 
 class MediaembedController(MinimalController):
     @validate(link = VLink('link'))
diff --git a/r2/r2/templates/ads.html b/r2/r2/templates/ads.html
index 16a5cef03..f72411a37 100644
--- a/r2/r2/templates/ads.html
+++ b/r2/r2/templates/ads.html
@@ -21,9 +21,7 @@
 ###############################################################################
 
 <%!
-   from r2.lib.template_helpers import get_domain, static
    from r2.lib import tracking
-   import random
  %>
 
 <iframe id="${thing.frame_id}" frameborder="0" scrolling="no" name="${thing.frame_id}"