Clean up unused state