correct naming
remove states