Support for idempotent remove, seperate purge