Added IDs to list items, removed unused code