Use ItemStack.clone() to retain NBT data from mods
And remove a few things we no longer need