Remove inappropriate nesting in all states