more on other states, cleanup