More work on item drops, remove built in ItemStack