Deleted List iterator and added casts