Add reference count based removal