Attempt to fix item removal glitches....this may need rewriting