Incremental cleanup