Remove stale code from previous iteration