Clean up two-step status