I was very nervous about changing the logic in populateLineItem because I figured that the removal of items in that line you pointed out was probably put in there for a reason.  So I was trying really hard not to touch any of the existing functionality since I didn't understand fully why that was in there.