Remove waffle state since this is not used