(refactor) clean up demos