Cleanup (#330)
Demo is obsolete (#330)