Got rid of unused states.