Cleanup ready for public demo.