Cleanup, and removed demo for now.