Remove helper initial state q_0