Remove measurement control and make pattern state machine continuous again