more cleanup on mbox-restore label changes