consolidate pop codes