#642 - removed unnecessary states.