Cleaned up weird and broken  upstream state