Don't use separate expunge step