removed unused class, fixed a bug when storing items