diff --git a/conf/packages.csv b/conf/packages.csv
index a9d9c56a60..c408662a36 100644
--- a/conf/packages.csv
+++ b/conf/packages.csv
@@ -2,7 +2,6 @@ class,package
 Block,net/minecraft/block
 BlockAnvil,net/minecraft/block
 BlockBasePressurePlate,net/minecraft/block
-BlockBaseRail,net/minecraft/block
 BlockBaseRailLogic,net/minecraft/block
 BlockBeacon,net/minecraft/block
 BlockBed,net/minecraft/block
@@ -79,9 +78,7 @@ BlockPistonExtension,net/minecraft/block
 BlockPistonMoving,net/minecraft/block
 BlockPortal,net/minecraft/block
 BlockPotato,net/minecraft/block
-BlockPoweredMetal,net/minecraft/block
 BlockPoweredOre,net/minecraft/block
-BlockPoweredRail,net/minecraft/block
 BlockPressurePlate,net/minecraft/block
 BlockPressurePlateWeighted,net/minecraft/block
 BlockPumpkin,net/minecraft/block
@@ -96,7 +93,6 @@ BlockRedstoneRepeater,net/minecraft/block
 BlockRedstoneTorch,net/minecraft/block
 BlockRedstoneWire,net/minecraft/block
 BlockReed,net/minecraft/block
-BlockRepeater,net/minecraft/block
 BlockSand,net/minecraft/block
 BlockSandStone,net/minecraft/block
 BlockSapling,net/minecraft/block
@@ -114,7 +110,6 @@ BlockStem,net/minecraft/block
 BlockStep,net/minecraft/block
 BlockStone,net/minecraft/block
 BlockStoneBrick,net/minecraft/block
-BlockStoneButton,net/minecraft/block
 BlockTNT,net/minecraft/block
 BlockTallGrass,net/minecraft/block
 BlockTorch,net/minecraft/block
@@ -124,14 +119,11 @@ BlockTripWireSource,net/minecraft/block
 BlockVine,net/minecraft/block
 BlockWall,net/minecraft/block
 BlockWeb,net/minecraft/block
-BlockWeightedPressurePlate,net/minecraft/block
 BlockWood,net/minecraft/block
-BlockWoodButton,net/minecraft/block
 BlockWoodSlab,net/minecraft/block
 BlockWorkbench,net/minecraft/block
 EnumMobType,net/minecraft/block
 ITileEntityProvider,net/minecraft/block
-RailLogic,net/minecraft/block
 RedstoneUpdateInfo,net/minecraft/block
 StepSound,net/minecraft/block
 StepSoundAnvil,net/minecraft/block
@@ -185,7 +177,6 @@ GuiButtonLink,net/minecraft/client/gui
 GuiButtonMerchant,net/minecraft/client/gui
 GuiButtonNextPage,net/minecraft/client/gui
 GuiChat,net/minecraft/client/gui
-GuiChatConfirmLink,net/minecraft/client/gui
 GuiCommandBlock,net/minecraft/client/gui
 GuiConfirmOpenLink,net/minecraft/client/gui
 GuiControls,net/minecraft/client/gui
@@ -247,13 +238,11 @@ GuiVideoSettings,net/minecraft/client/gui
 GuiWinGame,net/minecraft/client/gui
 GuiWorldSlot,net/minecraft/client/gui
 GuiYesNo,net/minecraft/client/gui
-InvitedSelectionList,net/minecraft/client/gui
 LoadingScreenRenderer,net/minecraft/client/gui
 MapItemRenderer,net/minecraft/client/gui
 Particle,net/minecraft/client/gui
 ScaledResolution,net/minecraft/client/gui
 ScreenChatOptions,net/minecraft/client/gui
-ScreenHopper,net/minecraft/client/gui
 SelectionListBase,net/minecraft/client/gui
 SelectionListInvited,net/minecraft/client/gui
 SelectionListLocation,net/minecraft/client/gui
@@ -293,14 +282,25 @@ GuiEditSign,net/minecraft/client/gui/inventory
 GuiFurnace,net/minecraft/client/gui/inventory
 GuiInventory,net/minecraft/client/gui/inventory
 SlotCreativeInventory,net/minecraft/client/gui/inventory
+ExceptionMcoHttp,net/minecraft/client/mco
+ExceptionMcoService,net/minecraft/client/mco
+ExceptionRetryCall,net/minecraft/client/mco
+Location,net/minecraft/client/mco
+Locations,net/minecraft/client/mco
+McoClient,net/minecraft/client/mco
 McoOption,net/minecraft/client/mco
 McoOptionNone,net/minecraft/client/mco
 McoOptionSome,net/minecraft/client/mco
 McoPair,net/minecraft/client/mco
-McoServerFetcher,net/minecraft/client/mco
-McoServerFetcherINNER1,net/minecraft/client/mco
+McoServer,net/minecraft/client/mco
+McoServerAddress,net/minecraft/client/mco
+McoServerList,net/minecraft/client/mco
 McoServerListINNER1,net/minecraft/client/mco
-TimerTaskMcoServerFetcherUpdate,net/minecraft/client/mco
+Request,net/minecraft/client/mco
+RequestDelete,net/minecraft/client/mco
+RequestGet,net/minecraft/client/mco
+RequestPost,net/minecraft/client/mco
+RequestPut,net/minecraft/client/mco
 TimerTaskMcoServerListUpdate,net/minecraft/client/mco
 ValueObjectList,net/minecraft/client/mco
 ValueObjectSubscription,net/minecraft/client/mco
@@ -362,7 +362,6 @@ ThreadConnectToServer,net/minecraft/client/multiplayer
 ThreadLanServerFind,net/minecraft/client/multiplayer
 ThreadLanServerPing,net/minecraft/client/multiplayer
 WorldClient,net/minecraft/client/multiplayer
-CallableLastTickedParticle,net/minecraft/client/particle
 EffectRenderer,net/minecraft/client/particle
 EntityAuraFX,net/minecraft/client/particle
 EntityBreakingFX,net/minecraft/client/particle
@@ -484,15 +483,6 @@ TextureCompass,net/minecraft/client/renderer/texture
 TextureManager,net/minecraft/client/renderer/texture
 TextureMap,net/minecraft/client/renderer/texture
 TextureStitched,net/minecraft/client/renderer/texture
-TextureCompassFX,net/minecraft/client/renderer/texturefx
-TextureFX,net/minecraft/client/renderer/texturefx
-TextureFlamesFX,net/minecraft/client/renderer/texturefx
-TextureLavaFX,net/minecraft/client/renderer/texturefx
-TextureLavaFlowFX,net/minecraft/client/renderer/texturefx
-TexturePortalFX,net/minecraft/client/renderer/texturefx
-TextureWatchFX,net/minecraft/client/renderer/texturefx
-TextureWaterFX,net/minecraft/client/renderer/texturefx
-TextureWaterFlowFX,net/minecraft/client/renderer/texturefx
 RenderEndPortal,net/minecraft/client/renderer/tileentity
 RenderEnderCrystal,net/minecraft/client/renderer/tileentity
 RenderItemFrame,net/minecraft/client/renderer/tileentity
@@ -520,23 +510,6 @@ TexturePackDownloadSuccess,net/minecraft/client/texturepacks
 TexturePackFolder,net/minecraft/client/texturepacks
 TexturePackImplementation,net/minecraft/client/texturepacks
 TexturePackList,net/minecraft/client/texturepacks
-ExceptionMcoHttp,net/minecraft/client/mco
-ExceptionMcoService,net/minecraft/client/mco
-ExceptionRetryCall,net/minecraft/client/mco
-Location,net/minecraft/client/mco
-Locations,net/minecraft/client/mco
-McoClient,net/minecraft/client/mco
-McoClientTypeRef,net/minecraft/client/mco
-McoServer,net/minecraft/client/mco
-McoServerAddress,net/minecraft/client/mco
-McoServerList,net/minecraft/client/mco
-McoServerListDummy,net/minecraft/client/mco
-McoServerListUpdateThread,net/minecraft/client/mco
-Request,net/minecraft/client/mco
-RequestDelete,net/minecraft/client/mco
-RequestGet,net/minecraft/client/mco
-RequestPost,net/minecraft/client/mco
-RequestPut,net/minecraft/client/mco
 CommandBase,net/minecraft/command
 CommandClearInventory,net/minecraft/command
 CommandDebug,net/minecraft/command
@@ -620,21 +593,9 @@ CreativeTabSearch,net/minecraft/creativetab
 CreativeTabTools,net/minecraft/creativetab
 CreativeTabTransport,net/minecraft/creativetab
 CreativeTabs,net/minecraft/creativetab
-BehaviorArrowDispense,net/minecraft/dispenser
-BehaviorBucketEmptyDispense,net/minecraft/dispenser
-BehaviorBucketFullDispense,net/minecraft/dispenser
 BehaviorDefaultDispenseItem,net/minecraft/dispenser
-BehaviorDispenseBoat,net/minecraft/dispenser
-BehaviorDispenseFireball,net/minecraft/dispenser
-BehaviorDispenseFirework,net/minecraft/dispenser
 BehaviorDispenseItemProvider,net/minecraft/dispenser
-BehaviorEggDispense,net/minecraft/dispenser
-BehaviorExpBottleDispense,net/minecraft/dispenser
-BehaviorMobEggDispense,net/minecraft/dispenser
-BehaviorPotionDispense,net/minecraft/dispenser
-BehaviorPotionDispenseLogic,net/minecraft/dispenser
 BehaviorProjectileDispense,net/minecraft/dispenser
-BehaviorSnowballDispense,net/minecraft/dispenser
 DispenserBehaviorArrow,net/minecraft/dispenser
 DispenserBehaviorBoat,net/minecraft/dispenser
 DispenserBehaviorDye,net/minecraft/dispenser
@@ -696,12 +657,6 @@ EntityFlying,net/minecraft/entity
 EntityHanging,net/minecraft/entity
 EntityList,net/minecraft/entity
 EntityLiving,net/minecraft/entity
-EntityMinecartChest,net/minecraft/entity
-EntityMinecartContainer,net/minecraft/entity
-EntityMinecartEmpty,net/minecraft/entity
-EntityMinecartFurnace,net/minecraft/entity
-EntityMinecartHopper,net/minecraft/entity
-EntityMinecartTNT,net/minecraft/entity
 EntitySelectorArmoredMob,net/minecraft/entity
 EntityTracker,net/minecraft/entity
 EntityTrackerEntry,net/minecraft/entity
@@ -714,10 +669,6 @@ IMerchant,net/minecraft/entity
 INpc,net/minecraft/entity
 IProjectile,net/minecraft/entity
 IRangedAttackMob,net/minecraft/entity
-ItemChestMinecart,net/minecraft/entity
-ItemFurnaceMinecart,net/minecraft/entity
-ItemRideableMinecart,net/minecraft/entity
-ItemTntMinecart,net/minecraft/entity
 NpcMerchant,net/minecraft/entity
 WatchableObject,net/minecraft/entity
 EntityAIArrowAttack,net/minecraft/entity/ai
@@ -794,11 +745,16 @@ EntityFireworkRocket,net/minecraft/entity/item
 EntityItem,net/minecraft/entity/item
 EntityItemFrame,net/minecraft/entity/item
 EntityMinecart,net/minecraft/entity/item
+EntityMinecartChest,net/minecraft/entity/item
+EntityMinecartContainer,net/minecraft/entity/item
+EntityMinecartEmpty,net/minecraft/entity/item
+EntityMinecartFurnace,net/minecraft/entity/item
+EntityMinecartHopper,net/minecraft/entity/item
+EntityMinecartTNT,net/minecraft/entity/item
 EntityPainting,net/minecraft/entity/item
 EntityTNTPrimed,net/minecraft/entity/item
 EntityXPOrb,net/minecraft/entity/item
 SoundUpdaterMinecart,net/minecraft/entity/item
-WeightedRandomMinecart,net/minecraft/entity/minecraft
 EntityBlaze,net/minecraft/entity/monster
 EntityCaveSpider,net/minecraft/entity/monster
 EntityCreeper,net/minecraft/entity/monster
@@ -863,7 +819,6 @@ ContainerMerchant,net/minecraft/inventory
 ContainerPlayer,net/minecraft/inventory
 ContainerRepair,net/minecraft/inventory
 ContainerWorkbench,net/minecraft/inventory
-ContainerWorldly,net/minecraft/inventory
 ICrafting,net/minecraft/inventory
 IInvBasic,net/minecraft/inventory
 IInventory,net/minecraft/inventory
@@ -875,7 +830,6 @@ InventoryEnderChest,net/minecraft/inventory
 InventoryLargeChest,net/minecraft/inventory
 InventoryMerchant,net/minecraft/inventory
 InventoryRepair,net/minecraft/inventory
-MenuHopper,net/minecraft/inventory
 Slot,net/minecraft/inventory
 SlotArmor,net/minecraft/inventory
 SlotBeacon,net/minecraft/inventory
@@ -1045,7 +999,6 @@ Packet207SetScore,net/minecraft/network/packet
 Packet208SetDisplayObjective,net/minecraft/network/packet
 Packet209SetPlayerTeam,net/minecraft/network/packet
 Packet20NamedEntitySpawn,net/minecraft/network/packet
-Packet21PickupSpawn,net/minecraft/network/packet
 Packet22Collect,net/minecraft/network/packet
 Packet23VehicleSpawn,net/minecraft/network/packet
 Packet24MobSpawn,net/minecraft/network/packet
@@ -1136,8 +1089,6 @@ ThreadDedicatedServer,net/minecraft/server
 ThreadMinecraftServer,net/minecraft/server
 CallableServerType,net/minecraft/server/dedicated
 CallableType,net/minecraft/server/dedicated
-ConsoleLogFormatter,net/minecraft/server/dedicated
-ConsoleLogManager,net/minecraft/server/dedicated
 DedicatedPlayerList,net/minecraft/server/dedicated
 DedicatedServer,net/minecraft/server/dedicated
 DedicatedServerCommandThread,net/minecraft/server/dedicated
@@ -1185,12 +1136,9 @@ ThreadStatSyncherSend,net/minecraft/stats
 CallableTileEntityData,net/minecraft/tileentity
 CallableTileEntityID,net/minecraft/tileentity
 CallableTileEntityName,net/minecraft/tileentity
-EntitySelectorHasInventory,net/minecraft/tileentity
-EntitySelectorHopperInventory,net/minecraft/tileentity
 Hopper,net/minecraft/tileentity
 MobSpawnerBaseLogic,net/minecraft/tileentity
 TileEntity,net/minecraft/tileentity
-TileEntityBase,net/minecraft/tileentity
 TileEntityBeacon,net/minecraft/tileentity
 TileEntityBrewingStand,net/minecraft/tileentity
 TileEntityChest,net/minecraft/tileentity
@@ -1206,12 +1154,12 @@ TileEntityFurnace,net/minecraft/tileentity
 TileEntityHopper,net/minecraft/tileentity
 TileEntityMobSpawner,net/minecraft/tileentity
 TileEntityMobSpawnerLogic,net/minecraft/tileentity
-TileEntityMobSpawnerSpawnData,net/minecraft/tileentity
 TileEntityNote,net/minecraft/tileentity
 TileEntityPiston,net/minecraft/tileentity
 TileEntityRecordPlayer,net/minecraft/tileentity
 TileEntitySign,net/minecraft/tileentity
 TileEntitySkull,net/minecraft/tileentity
+WeightedRandomMinecart,net/minecraft/tileentity
 AABBLocalPool,net/minecraft/util
 AABBPool,net/minecraft/util
 AxisAlignedBB,net/minecraft/util
@@ -1279,7 +1227,6 @@ ChunkCoordIntPair,net/minecraft/world
 ChunkPosition,net/minecraft/world
 ColorizerFoliage,net/minecraft/world
 ColorizerGrass,net/minecraft/world
-ColorizerWater,net/minecraft/world
 EnumGameType,net/minecraft/world
 EnumSkyBlock,net/minecraft/world
 Explosion,net/minecraft/world
diff --git a/patches/minecraft/net/minecraft/entity/EntityList.java.patch b/patches/minecraft/net/minecraft/entity/EntityList.java.patch
index 77eeeeccd8..f94dacad43 100644
--- a/patches/minecraft/net/minecraft/entity/EntityList.java.patch
+++ b/patches/minecraft/net/minecraft/entity/EntityList.java.patch
@@ -10,7 +10,7 @@
  import net.minecraft.entity.ai.EntityMinecartMobSpawner;
  import net.minecraft.entity.boss.EntityDragon;
  import net.minecraft.entity.boss.EntityWither;
-@@ -120,9 +123,10 @@
+@@ -125,9 +128,10 @@
              p_75615_0_.func_82580_o("Type");
          }
  
@@ -22,7 +22,7 @@
  
              if (oclass != null)
              {
-@@ -136,7 +140,17 @@
+@@ -141,7 +145,17 @@
  
          if (entity != null)
          {
diff --git a/update_packages.py b/update_packages.py
index 6c0fba39a4..9b573b6160 100644
--- a/update_packages.py
+++ b/update_packages.py
@@ -80,6 +80,7 @@ def main():
     for cls in pkgs.keys():
         if not cls in classes:
             print 'Removed Class: %s/%s' % (pkgs[cls], cls)
+            pkgs.pop(cls)
         
     for cls in classes:
         if not cls in pkgs.keys():