Added id count to items, removed some unused code

Signed-off-by: Scott Skender <sjskender@gmail.com>