Being OCD about unused imports, removed ambiguous ItemStack data