Cleanup + preparations for publishing to GitHub for the demo