Reorganized item variables, removed vanilla