diff --git a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
index 7fc3d035..338d1905 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
@@ -150,8 +150,6 @@ void UIScene_InGameInfoMenu::updateTooltips()
 void UIScene_InGameInfoMenu::handleDestroy()
 {
 	g_NetworkManager.UnRegisterPlayerChangedCallback(m_iPad, &UIScene_InGameInfoMenu::OnPlayerChanged, this);
-
-	m_parentLayer->removeComponent(eUIComponent_MenuBackground);
 }
 
 void UIScene_InGameInfoMenu::handleGainFocus(bool navBack)
diff --git a/Minecraft.Client/DurangoMedia/4J_strings.h b/Minecraft.Client/DurangoMedia/4J_strings.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/Minecraft.Client/DurangoMedia/Layout/Contributors/015236CEB96771670B67A93104CDDD.filestate.xml b/Minecraft.Client/DurangoMedia/Layout/Contributors/015236CEB96771670B67A93104CDDD.filestate.xml
deleted file mode 100644
index c7421404..00000000
--- a/Minecraft.Client/DurangoMedia/Layout/Contributors/015236CEB96771670B67A93104CDDD.filestate.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<Contributor ComponentSource="c:\users\paddy\work\tfs\minecraft\dev-cu2-xb1-ps4-x360\commonmedia.vcxproj">
-  <Configuration Name="Debug" />
-</Contributor>
\ No newline at end of file
diff --git a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/AppxManifest.xml b/Minecraft.Client/DurangoMedia/Layout/Image/Loose/AppxManifest.xml
deleted file mode 100644
index ae7d93e5..00000000
--- a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/AppxManifest.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:mx="http://schemas.microsoft.com/appx/2013/xbox/manifest" IgnorableNamespaces="mx">
-  <Identity Name="Minecraft" Publisher="CN=Publisher" Version="1.0.406.0" ProcessorArchitecture="x64" />
-  <Properties>
-    <DisplayName>Minecraft: Xbox One Edition</DisplayName>
-    <PublisherDisplayName>Microsoft Studios</PublisherDisplayName>
-    <Logo>StoreLogo.png</Logo>
-    <Description>Minecraft</Description>
-  </Properties>
-  <Prerequisites>
-    <OSMinVersion>6.2</OSMinVersion>
-    <OSMaxVersionTested>6.2</OSMaxVersionTested>
-    <mx:ApplicationEnvironment>title</mx:ApplicationEnvironment>
-    <mx:OSName>era</mx:OSName>
-  </Prerequisites>
-  <Resources>
-    <Resource Language="en-us" />
-    <Resource Language="en-gb" />
-    <Resource Language="de-de" />
-    <Resource Language="es-es" />
-    <Resource Language="es-mx" />
-    <Resource Language="fr-fr" />
-    <Resource Language="it-it" />
-    <Resource Language="pt-br" />
-    <Resource Language="pt-pt" />
-    <Resource Language="ja-jp" />
-    <Resource Language="ko-kr" />
-    <Resource Language="zh-tw" />
-    <Resource Language="zh-hk" />
-  </Resources>
-  <Applications>
-    <Application Id="App" Executable="Minecraft.Client.exe" EntryPoint="Minecraft.App">
-      <VisualElements DisplayName="Minecraft: Xbox One Edition" Logo="StoreLogo.png" SmallLogo="SmallLogo.png" Description="Minecraft" ForegroundText="light" BackgroundColor="#464646">
-        <SplashScreen Image="SplashScreen.png" />
-      </VisualElements>
-      <Extensions>
-        <mx:Extension Category="xbox.live">
-          <mx:XboxLive TitleId="149E11AE" PrimaryServiceConfigId="05c20100-6e60-45d5-878a-4903149e11ae">
-            <mx:ConnectedStorage MaxMegabytesPerUser="1024" />
-          </mx:XboxLive>
-        </mx:Extension>
-        <mx:Extension Category="windows.xbox.networking">
-          <mx:XboxNetworkingManifest>
-            <mx:SocketDescriptions>
-              <mx:SocketDescription Name="MultiplayerSocketUdp" SecureIpProtocol="Udp" BoundPort="8700">
-                <mx:AllowedUsages>
-                  <mx:SecureDeviceSocketUsage Type="Initiate" />
-                  <mx:SecureDeviceSocketUsage Type="Accept" />
-                  <mx:SecureDeviceSocketUsage Type="SendGameData" />
-                  <mx:SecureDeviceSocketUsage Type="ReceiveGameData" />
-                  <mx:SecureDeviceSocketUsage Type="SendChat" />
-                  <mx:SecureDeviceSocketUsage Type="ReceiveChat" />
-                </mx:AllowedUsages>
-              </mx:SocketDescription>
-            </mx:SocketDescriptions>
-            <mx:SecureDeviceAssociationTemplates>
-              <mx:SecureDeviceAssociationTemplate Name="MultiplayerUdp" InitiatorSocketDescription="MultiplayerSocketUdp" AcceptorSocketDescription="MultiplayerSocketUdp" MultiplayerSessionRequirement="Required">
-                <mx:AllowedUsages>
-                  <mx:SecureDeviceAssociationUsage Type="Default" />
-                </mx:AllowedUsages>
-              </mx:SecureDeviceAssociationTemplate>
-            </mx:SecureDeviceAssociationTemplates>
-          </mx:XboxNetworkingManifest>
-        </mx:Extension>
-      </Extensions>
-    </Application>
-  </Applications>
-  <Extensions>
-    <mx:PackageExtension Category="xbox.store">
-      <mx:XboxStore>
-        <mx:RelatedProducts>
-          <mx:RelatedProduct Id="582e7bcc-11bc-4702-ab1b-b31566f8e327" />
-        </mx:RelatedProducts>
-      </mx:XboxStore>
-    </mx:PackageExtension>
-    <Extension Category="windows.activatableClass.inProcessServer">
-      <InProcessServer>
-        <Path>windows.xbox.networking.realtimesession.dll</Path>
-        <ActivatableClass ActivatableClassId="Windows.Xbox.Networking.RealtimeSession.Session" ThreadingModel="both" />
-      </InProcessServer>
-    </Extension>
-    <Extension Category="windows.activatableClass.inProcessServer">
-      <InProcessServer>
-        <Path>Microsoft.Xbox.GameChat.dll</Path>
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.GameChat.ChatManager" ThreadingModel="both" />
-      </InProcessServer>
-    </Extension>
-    <Extension Category="windows.activatableClass.inProcessServer">
-      <InProcessServer>
-        <Path>Microsoft.Xbox.Services.dll</Path>
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.XboxLiveContext" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.Configuration" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.Multiplayer.MultiplayerQualityOfServiceMeasurements" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionReference" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.Multiplayer.MultiplayerSessionCapabilities" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.Multiplayer.MultiplayerSession" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.Matchmaking.CreateMatchTicketResponse" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.Matchmaking.HopperStatisticsResponse" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.Matchmaking.MatchTicketDetailsResponse" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.Presence.PresenceData" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.TitleStorage.TitleStorageBlobMetadata" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.UserStatistics.RequestedStatistics" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.Privacy.PermissionIdConstants" ThreadingModel="both" />
-        <ActivatableClass ActivatableClassId="Microsoft.Xbox.Services.Social.SocialGroupConstants" ThreadingModel="both" />
-      </InProcessServer>
-    </Extension>
-  </Extensions>
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <mx:Capability Name="kinectAudio" />
-    <mx:Capability Name="kinectGamechat" />
-  </Capabilities>
-</Package>
\ No newline at end of file
diff --git a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/Microsoft.Xbox.GameChat.dll b/Minecraft.Client/DurangoMedia/Layout/Image/Loose/Microsoft.Xbox.GameChat.dll
deleted file mode 100644
index 3d83ce3f..00000000
Binary files a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/Microsoft.Xbox.GameChat.dll and /dev/null differ
diff --git a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/Microsoft.Xbox.Services.dll b/Minecraft.Client/DurangoMedia/Layout/Image/Loose/Microsoft.Xbox.Services.dll
deleted file mode 100644
index 853404c1..00000000
Binary files a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/Microsoft.Xbox.Services.dll and /dev/null differ
diff --git a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/Minecraft.Client.exe b/Minecraft.Client/DurangoMedia/Layout/Image/Loose/Minecraft.Client.exe
deleted file mode 100644
index e505c521..00000000
Binary files a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/Minecraft.Client.exe and /dev/null differ
diff --git a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/SmallLogo.png b/Minecraft.Client/DurangoMedia/Layout/Image/Loose/SmallLogo.png
deleted file mode 100644
index 00b54071..00000000
Binary files a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/SmallLogo.png and /dev/null differ
diff --git a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/SplashScreen.png b/Minecraft.Client/DurangoMedia/Layout/Image/Loose/SplashScreen.png
deleted file mode 100644
index 948fdad7..00000000
Binary files a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/SplashScreen.png and /dev/null differ
diff --git a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/StoreLogo.png b/Minecraft.Client/DurangoMedia/Layout/Image/Loose/StoreLogo.png
deleted file mode 100644
index 679b33da..00000000
Binary files a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/StoreLogo.png and /dev/null differ
diff --git a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/appdata.bin b/Minecraft.Client/DurangoMedia/Layout/Image/Loose/appdata.bin
deleted file mode 100644
index 42e51480..00000000
Binary files a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/appdata.bin and /dev/null differ
diff --git a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/windows.xbox.networking.realtimesession.dll b/Minecraft.Client/DurangoMedia/Layout/Image/Loose/windows.xbox.networking.realtimesession.dll
deleted file mode 100644
index 7ff53c86..00000000
Binary files a/Minecraft.Client/DurangoMedia/Layout/Image/Loose/windows.xbox.networking.realtimesession.dll and /dev/null differ
diff --git a/Minecraft.Client/Windows64Media/DLC/LittleBigPlanet/Skins.pck b/Minecraft.Client/Windows64Media/DLC/LittleBigPlanet/Skins.pck
new file mode 100644
index 00000000..07df720d
Binary files /dev/null and b/Minecraft.Client/Windows64Media/DLC/LittleBigPlanet/Skins.pck differ
diff --git a/Minecraft.World/LevelChunk.cpp b/Minecraft.World/LevelChunk.cpp
index 118dbcdd..29308e29 100644
--- a/Minecraft.World/LevelChunk.cpp
+++ b/Minecraft.World/LevelChunk.cpp
@@ -1628,18 +1628,18 @@ void LevelChunk::getEntities(shared_ptr<Entity> except, AABB *bb, vector<shared_
 
 		for (auto& e : *entities)
 		{
-			if ( e && e != except && e->bb->intersects(bb) && (selector == nullptr || selector->matches(e)))
+			if (e && e != except && e->bb->intersects(bb) && (selector == nullptr || selector->matches(e)))
 			{
 				es.push_back(e);
+
 				vector<shared_ptr<Entity> > *subs = e->getSubEntities();
 				if (subs != nullptr)
 				{
-					for (const auto& sub : *subs)
+					for (const auto& subEntity : *subs)
 					{
-						e = sub;
-						if ( e && e != except && e->bb->intersects(bb) && (selector == nullptr || selector->matches(e)))
+						if (subEntity && subEntity != except && subEntity->bb->intersects(bb) && (selector == nullptr || selector->matches(subEntity)))
 						{
-							es.push_back(e);
+							es.push_back(subEntity);
 						}
 					}
 				}