Removed code to account for out of order states

It broke everything