Cleanup from working state