(Sobel) Cleanup and get ready for EDERC demo.