removing unused items; starting to adapt to object-based operation