Some more cleanup for this demo