BS-9618, change remove method to archive the element before remove