Remove states map in statefactory (redundant)