State cleaned up