Clean up before revisiting to finalize