diff --git a/wagtail/wagtailembeds/__init__.py b/wagtail/wagtailembeds/__init__.py
index 54d9556086..4778906962 100644
--- a/wagtail/wagtailembeds/__init__.py
+++ b/wagtail/wagtailembeds/__init__.py
@@ -1,4 +1 @@
-from .models import Embed
-from .embeds import get_embed
-
 default_app_config = 'wagtail.wagtailembeds.apps.WagtailEmbedsAppConfig'
diff --git a/wagtail/wagtailembeds/format.py b/wagtail/wagtailembeds/format.py
index 8a73ff5242..abbb6b54b3 100644
--- a/wagtail/wagtailembeds/format.py
+++ b/wagtail/wagtailembeds/format.py
@@ -2,7 +2,7 @@ from __future__ import division  # Use true division
 
 from django.template.loader import render_to_string
 
-from wagtail.wagtailembeds import get_embed
+from wagtail.wagtailembeds.embeds import get_embed
 
 
 def embed_to_frontend_html(url):
diff --git a/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py b/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py
index f021d5761e..2aa4fdc49f 100644
--- a/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py
+++ b/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py
@@ -3,7 +3,7 @@ import warnings
 from django import template
 from django.utils.safestring import mark_safe
 
-from wagtail.wagtailembeds import get_embed
+from wagtail.wagtailembeds.embeds import get_embed
 
 
 register = template.Library()
diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index 91e41d420a..8fc135faa2 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -15,13 +15,14 @@ from django.test import TestCase
 
 from wagtail.tests.utils import WagtailTestUtils, unittest
 
-from wagtail.wagtailembeds import get_embed
 from wagtail.wagtailembeds.embeds import (
     EmbedNotFoundException,
     EmbedlyException,
     AccessDeniedEmbedlyException,
+    get_embed,
+    embedly as wagtail_embedly,
+    oembed as wagtail_oembed,
 )
-from wagtail.wagtailembeds.embeds import embedly as wagtail_embedly, oembed as wagtail_oembed
 from wagtail.wagtailembeds.templatetags.wagtailembeds_tags import embed as embed_filter
 
 
diff --git a/wagtail/wagtailsearch/__init__.py b/wagtail/wagtailsearch/__init__.py
index 0e24694bee..ac4f1278af 100644
--- a/wagtail/wagtailsearch/__init__.py
+++ b/wagtail/wagtailsearch/__init__.py
@@ -1,5 +1 @@
-from wagtail.wagtailsearch.index import Indexed
-from wagtail.wagtailsearch.signal_handlers import register_signal_handlers
-from wagtail.wagtailsearch.backends import get_search_backend
-
 default_app_config = 'wagtail.wagtailsearch.apps.WagtailSearchAppConfig'
diff --git a/wagtail/wagtailsearch/management/commands/update_index.py b/wagtail/wagtailsearch/management/commands/update_index.py
index c52b756398..d03ed1c6b3 100644
--- a/wagtail/wagtailsearch/management/commands/update_index.py
+++ b/wagtail/wagtailsearch/management/commands/update_index.py
@@ -1,7 +1,8 @@
 from django.core.management.base import BaseCommand
 from django.db import models
 
-from wagtail.wagtailsearch import Indexed, get_search_backend
+from wagtail.wagtailsearch.indexed import Indexed
+from wagtail.wagtailsearch.backends import get_search_backend
 
 
 class Command(BaseCommand):