Fix state bug with first schedule

First schedule not clearing state properly -- fix to use common code