Remove duplicate/old code for dummy items