diff --git a/flextype/Entries.php b/flextype/Entries.php
index e7d29b30..d9820b4e 100755
--- a/flextype/Entries.php
+++ b/flextype/Entries.php
@@ -14,7 +14,6 @@ namespace Flextype;
 
 use Flextype\Component\Arr\Arr;
 use Flextype\Component\Filesystem\Filesystem;
-use Flextype\Component\Registry\Registry;
 
 class Entries
 {
diff --git a/flextype/Fieldsets.php b/flextype/Fieldsets.php
index 7b31ebae..b4eaba87 100644
--- a/flextype/Fieldsets.php
+++ b/flextype/Fieldsets.php
@@ -13,7 +13,6 @@
 namespace Flextype;
 
 use Flextype\Component\Filesystem\Filesystem;
-use Flextype\Component\Registry\Registry;
 
 class Fieldsets
 {
diff --git a/flextype/locales/Locales.php b/flextype/locales/Locales.php
index d7151040..8a7d0b1b 100644
--- a/flextype/locales/Locales.php
+++ b/flextype/locales/Locales.php
@@ -1,6 +1,6 @@
 <?php
 
-return $locales = [
+return [
     'af'         => ['name' => 'Afrikaans', 'nativeName' => 'Afrikaans'],
     'af_ZA'      => ['name' => 'Afrikaans', 'nativeName' => 'Afrikaans'],
     'ak'         => ['name' => 'Akan', 'nativeName' => 'Akan'], // unverified native name
diff --git a/flextype/shortcodes/ImagesShortcode.php b/flextype/shortcodes/ImagesShortcode.php
index 2dec89c6..970ce64e 100644
--- a/flextype/shortcodes/ImagesShortcode.php
+++ b/flextype/shortcodes/ImagesShortcode.php
@@ -12,7 +12,6 @@
 
 namespace Flextype;
 
-use Flextype\Component\Http\Http;
 use Thunder\Shortcode\ShortcodeFacade;
 use Thunder\Shortcode\Shortcode\ShortcodeInterface;
 
diff --git a/flextype/shortcodes/ImagesUrlShortcode.php b/flextype/shortcodes/ImagesUrlShortcode.php
index 1eb7bf71..5df3464a 100644
--- a/flextype/shortcodes/ImagesUrlShortcode.php
+++ b/flextype/shortcodes/ImagesUrlShortcode.php
@@ -12,7 +12,6 @@
 
 namespace Flextype;
 
-use Flextype\Component\Http\Http;
 use Thunder\Shortcode\ShortcodeFacade;
 use Thunder\Shortcode\Shortcode\ShortcodeInterface;
 
diff --git a/flextype/shortcodes/SiteUrlShortcode.php b/flextype/shortcodes/SiteUrlShortcode.php
index 72dd220f..88a893f8 100644
--- a/flextype/shortcodes/SiteUrlShortcode.php
+++ b/flextype/shortcodes/SiteUrlShortcode.php
@@ -12,7 +12,6 @@
 
 namespace Flextype;
 
-use Flextype\Component\Http\Http;
 use Thunder\Shortcode\ShortcodeFacade;
 use Thunder\Shortcode\Shortcode\ShortcodeInterface;