Make add and remove idempotent - referencing #295, #279