Debug add and remove