More small stuff

Being OCD about unused imports/variables, removed ambiguous ItemStack data