Made the demo a SPA.

 + cleanups.