I suggest building in the auto remove when saved, rather than it be a seperate code
Ticket PICARD-3363 entered to track this request.