Code cleanup in preparation for demo.