Clean up for demo with Lee