Clean up ItemRemove a bit