Fixing redundant states

Change-Id: Iace086ebd2bd2b4d15d43308816504dfc99500b3