Refactored code: removed unused items.