PLFENG-2210: gadget code cleanup