States updated and cleaned