Remove some debug stuff and update some more state.