Keep working to clean up state