Remove temporary waiting_feedback value
Allow current_state to be null