[SWANcom] Clean Hold Shelf Issue